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()

PATCHES=( "${FILESDIR}/${P}-grep223.patch" )