Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 425456 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]
Patch from upstream
0001-liblxqt-adapt-to-new-grep.patch (text/plain), 7.49 KB, created by
sven.a.jonsson
on 2016-02-14 11:13:17 UTC
(
hide
)
Description:
Patch from upstream
Filename:
MIME Type:
Creator:
sven.a.jonsson
Created:
2016-02-14 11:13:17 UTC
Size:
7.49 KB
patch
obsolete
>From 1009badf29d332d4890e377bd42bf225a6d39f37 Mon Sep 17 00:00:00 2001 >Message-Id: <1009badf29d332d4890e377bd42bf225a6d39f37.1455436181.git.sven.a.jonsson@tele2.se> >From: Sven Jonsson <sven.a.jonsson@tele2.se> >Date: Sat, 13 Feb 2016 08:23:55 +0100 >Subject: [PATCH 1/5] liblxqt: adapt to new grep > >--- > .../liblxqt/files/liblxqt-0.10.0-grep223.patch | 35 ++++++++++++++++++++++ > ...lxqt-0.10.0.ebuild => liblxqt-0.10.0-r1.ebuild} | 2 ++ > ...t-0.10.0.ebuild => lxqt-about-0.10.0-r1.ebuild} | 0 > ...n-0.10.0.ebuild => lxqt-admin-0.10.0-r1.ebuild} | 0 > ...-0.10.0.ebuild => lxqt-common-0.10.0-r1.ebuild} | 0 > ...-0.10.0.ebuild => lxqt-config-0.10.0-r1.ebuild} | 0 > ...0.0.ebuild => lxqt-globalkeys-0.10.0-r1.ebuild} | 0 > ....ebuild => lxqt-notificationd-0.10.0-r1.ebuild} | 0 > ...build => lxqt-openssh-askpass-0.10.0-r1.ebuild} | 0 > ....10.0-r1.ebuild => lxqt-panel-0.10.0-r2.ebuild} | 0 > ...10.0.ebuild => lxqt-policykit-0.10.0-r1.ebuild} | 0 > ...build => lxqt-powermanagement-0.10.0-r1.ebuild} | 0 > ....10.0.ebuild => lxqt-qtplugin-0.10.0-r1.ebuild} | 0 > ...-0.10.0.ebuild => lxqt-runner-0.10.0-r1.ebuild} | 0 > ...0.10.0.ebuild => lxqt-session-0.10.0-r1.ebuild} | 0 > ...do-0.10.0.ebuild => lxqt-sudo-0.10.0-r1.ebuild} | 0 > 16 files changed, 37 insertions(+) > >diff --git a/lxqt-base/liblxqt/files/liblxqt-0.10.0-grep223.patch b/lxqt-base/liblxqt/files/liblxqt-0.10.0-grep223.patch >new file mode 100644 >index 0000000..e32a8a3 >--- /dev/null >+++ b/lxqt-base/liblxqt/files/liblxqt-0.10.0-grep223.patch >@@ -0,0 +1,35 @@ >+From 082321a1a513b5fb694ca60e368eddd57b58f433 Mon Sep 17 00:00:00 2001 >+From: Palo Kisa <palo.kisa@gmail.com> >+Date: Fri, 12 Feb 2016 08:11:41 +0100 >+Subject: [PATCH] TranslateDesktop: Use -a switch in grep commands >+ >+As of grep v2.23 some translation files are considered as binary (maybe because of some locale settings) >+and then the created .desktop file is malformed. So we force the grep to handle all provided input >+files as text. >+ >+closes lxde/lxqt#957 >+--- >+ cmake/modules/LXQtTranslateDesktop.cmake | 6 +++--- >+ 1 file changed, 3 insertions(+), 3 deletions(-) >+ >+diff --git a/cmake/modules/LXQtTranslateDesktop.cmake b/cmake/modules/LXQtTranslateDesktop.cmake >+index e770b63..217400a 100644 >+--- a/cmake/modules/LXQtTranslateDesktop.cmake >++++ b/cmake/modules/LXQtTranslateDesktop.cmake >+@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT) >+ if (_translations) >+ list(SORT _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() >diff --git a/lxqt-base/liblxqt/liblxqt-0.10.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.10.0-r1.ebuild >similarity index 94% >rename from lxqt-base/liblxqt/liblxqt-0.10.0.ebuild >rename to lxqt-base/liblxqt/liblxqt-0.10.0-r1.ebuild >index 08001a0..975f734 100644 >--- a/lxqt-base/liblxqt/liblxqt-0.10.0.ebuild >+++ b/lxqt-base/liblxqt/liblxqt-0.10.0-r1.ebuild >@@ -32,6 +32,8 @@ DEPEND="${RDEPEND} > dev-qt/linguist-tools:5 > " > >+PATCHES=( "${FILESDIR}/${P}-grep223.patch" ) >+ > pkg_pretend() { > if [[ ${MERGE_TYPE} != binary ]]; then > [[ $(gcc-version) < 4.8 ]] && \ >diff --git a/lxqt-base/lxqt-about/lxqt-about-0.10.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-about/lxqt-about-0.10.0.ebuild >rename to lxqt-base/lxqt-about/lxqt-about-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.10.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-admin/lxqt-admin-0.10.0.ebuild >rename to lxqt-base/lxqt-admin/lxqt-admin-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-common/lxqt-common-0.10.0.ebuild b/lxqt-base/lxqt-common/lxqt-common-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-common/lxqt-common-0.10.0.ebuild >rename to lxqt-base/lxqt-common/lxqt-common-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-config/lxqt-config-0.10.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-config/lxqt-config-0.10.0.ebuild >rename to lxqt-base/lxqt-config/lxqt-config-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.10.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.10.0.ebuild >rename to lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.10.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-notificationd/lxqt-notificationd-0.10.0.ebuild >rename to lxqt-base/lxqt-notificationd/lxqt-notificationd-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.10.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.10.0.ebuild >rename to lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r2.ebuild >similarity index 100% >rename from lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild >rename to lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r2.ebuild >diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0.ebuild >rename to lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.10.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.10.0.ebuild >rename to lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0.ebuild >rename to lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.10.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-runner/lxqt-runner-0.10.0.ebuild >rename to lxqt-base/lxqt-runner/lxqt-runner-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-session/lxqt-session-0.10.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-session/lxqt-session-0.10.0.ebuild >rename to lxqt-base/lxqt-session/lxqt-session-0.10.0-r1.ebuild >diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.10.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.10.0-r1.ebuild >similarity index 100% >rename from lxqt-base/lxqt-sudo/lxqt-sudo-0.10.0.ebuild >rename to lxqt-base/lxqt-sudo/lxqt-sudo-0.10.0-r1.ebuild >-- >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