[patch] Copy of the patch for lximage-qt

0004-lximage-qt-adapt-to-new-grep.patch (text/plain), 2.99 KB, created by sven.a.jonsson on 2016-02-14 11:15:46 UTC

From 9cc1a4a3ef1ade9031abb522d2d2e4816e0533c3 Mon Sep 17 00:00:00 2001
Message-Id: <9cc1a4[e-mail]>
In-Reply-To: <1009ba[e-mail]>
References: <1009ba[e-mail]>
From: Sven Jonsson <[e-mail]>
Date: Sun, 14 Feb 2016 07:40:10 +0100
Subject: [PATCH 4/5] lximage-qt: adapt to new grep

---
 .../files/lximage-qt-0.4.0-grep223.patch           | 34 ++++++++++++++++++++++
 ...-qt-0.4.0.ebuild => lximage-qt-0.4.0-r1.ebuild} |  2 ++
 2 files changed, 36 insertions(+)

diff --git a/media-gfx/lximage-qt/files/lximage-qt-0.4.0-grep223.patch b/media-gfx/lximage-qt/files/lximage-qt-0.4.0-grep223.patch
new file mode 100644
index 0000000..3ec73fb
--- /dev/null
+++ b/media-gfx/lximage-qt/files/lximage-qt-0.4.0-grep223.patch
@@ -0,0 +1,34 @@
+From ab642fc40a1c086678bf34420bfcb2de7afe3458 Mon Sep 17 00:00:00 2001
+Message-Id: <ab642f[e-mail]>
+From: Sven Jonsson <[e-mail]>
+Date: Sat, 13 Feb 2016 14:54:37 +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/media-gfx/lximage-qt/lximage-qt-0.4.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.4.0-r1.ebuild
similarity index 95%
rename from media-gfx/lximage-qt/lximage-qt-0.4.0.ebuild
rename to media-gfx/lximage-qt/lximage-qt-0.4.0-r1.ebuild
index 92fbf5a..bdb31b6 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.4.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.4.0-r1.ebuild
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-grep223.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT5=ON
-- 
2.7.1