@@ -, +, @@ --- .../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(+) --- a/lxqt-base/liblxqt/files/liblxqt-0.10.0-grep223.patch +++ a/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 +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() --- a/lxqt-base/liblxqt/liblxqt-0.10.0.ebuild +++ a/lxqt-base/liblxqt/liblxqt-0.10.0.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 ]] && \