Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 425458 Details for
Bug 574472
lxqt-base/lxqt-common-0.10.0 (actually several lxqt packages) installs unusable .desktop files with grep 2.23
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Copy of the patch for pcmanfm-qt
0002-pcmanfm-qt-adapt-to-new-grep.patch (text/plain), 3.02 KB, created by
sven.a.jonsson
on 2016-02-14 11:14:14 UTC
(
hide
)
Description:
Copy of the patch for pcmanfm-qt
Filename:
MIME Type:
Creator:
sven.a.jonsson
Created:
2016-02-14 11:14:14 UTC
Size:
3.02 KB
patch
obsolete
>From ea3c657adc1dc741b7051da969daaef751e46cdb Mon Sep 17 00:00:00 2001 >Message-Id: <ea3c657adc1dc741b7051da969daaef751e46cdb.1455436181.git.sven.a.jonsson@tele2.se> >In-Reply-To: <1009badf29d332d4890e377bd42bf225a6d39f37.1455436181.git.sven.a.jonsson@tele2.se> >References: <1009badf29d332d4890e377bd42bf225a6d39f37.1455436181.git.sven.a.jonsson@tele2.se> >From: Sven Jonsson <sven.a.jonsson@tele2.se> >Date: Sat, 13 Feb 2016 18:04:21 +0100 >Subject: [PATCH 2/5] pcmanfm-qt: adapt to new grep > >--- > .../files/pcmanfm-qt-0.10.0-grep223.patch | 34 ++++++++++++++++++++++ > ...t-0.10.0.ebuild => pcmanfm-qt-0.10.0-r1.ebuild} | 2 ++ > 2 files changed, 36 insertions(+) > >diff --git a/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.10.0-grep223.patch b/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.10.0-grep223.patch >new file mode 100644 >index 0000000..1ea6a92 >--- /dev/null >+++ b/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.10.0-grep223.patch >@@ -0,0 +1,34 @@ >+From 270c9f7c04df37752f52b7e6ac49a9072c16119c Mon Sep 17 00:00:00 2001 >+Message-Id: <270c9f7c04df37752f52b7e6ac49a9072c16119c.1455382175.git.sven.a.jonsson@tele2.se> >+From: Sven Jonsson <sven.a.jonsson@tele2.se> >+Date: Sat, 13 Feb 2016 14:58:17 +0100 >+Subject: [PATCH] LXQtTranslateDesktop: adapt to grep 2.23 >+ >+--- >+ cmake/LXQtTranslateDesktop.cmake | 6 +++--- >+ 1 file changed, 3 insertions(+), 3 deletions(-) >+ >+diff --git a/cmake/LXQtTranslateDesktop.cmake b/cmake/LXQtTranslateDesktop.cmake >+index 522ed68..7569f03 100644 >+--- a/cmake/LXQtTranslateDesktop.cmake >++++ b/cmake/LXQtTranslateDesktop.cmake >+@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT) >+ set(_pattern "'\\[.*]\\s*='") >+ if (_translations) >+ add_custom_command(OUTPUT ${_outFile} >+- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} >+- COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile} >++ COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} >++ COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile} >+ COMMENT "Generating ${_fileName}${_fileExt}" >+ ) >+ else() >+ add_custom_command(OUTPUT ${_outFile} >+- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} >++ COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} >+ COMMENT "Generating ${_fileName}${_fileExt}" >+ ) >+ endif() >+-- >+2.7.1 >+ >diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0-r1.ebuild >similarity index 96% >rename from x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild >rename to x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0-r1.ebuild >index 16f804b..1579080 100644 >--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild >+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0-r1.ebuild >@@ -40,6 +40,8 @@ DEPEND="${CDEPEND} > sys-devel/gettext > virtual/pkgconfig" > >+PATCHES=( "${FILESDIR}/${P}-grep223.patch" ) >+ > src_prepare() { > # fix multilib > sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \ >-- >2.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 574472
:
425260
|
425262
|
425264
|
425456
| 425458 |
425460
|
425462