[patch] Copy of the patch for obconf-qt

0003-obconf-qt-adapt-to-new-grep.patch (text/plain), 3.02 KB, created by sven.a.jonsson on 2016-02-14 11:14:57 UTC

From a325ae97999d0d31163161497453035b5ae305a5 Mon Sep 17 00:00:00 2001
Message-Id: <a325ae[e-mail]>
In-Reply-To: <1009ba[e-mail]>
References: <1009ba[e-mail]>
From: Sven Jonsson <[e-mail]>
Date: Sat, 13 Feb 2016 18:28:46 +0100
Subject: [PATCH 3/5] obconf-qt: adapt to new grep

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

diff --git a/x11-misc/obconf-qt/files/obconf-qt-0.9.0_p20150729-grep223.patch b/x11-misc/obconf-qt/files/obconf-qt-0.9.0_p20150729-grep223.patch
new file mode 100644
index 0000000..2af13aa
--- /dev/null
+++ b/x11-misc/obconf-qt/files/obconf-qt-0.9.0_p20150729-grep223.patch
@@ -0,0 +1,34 @@
+From 7ca239cb48b4554d904a0b6514359e9a8926c766 Mon Sep 17 00:00:00 2001
+Message-Id: <7ca239[e-mail]>
+From: Sven Jonsson <[e-mail]>
+Date: Sat, 13 Feb 2016 14:56:24 +0100
+Subject: [PATCH] LXQtTranslateDesktop: adapted 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/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729-r1.ebuild
similarity index 94%
rename from x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
rename to x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729-r1.ebuild
index 11b3994..23c371d 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729-r1.ebuild
@@ -38,3 +38,5 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-grep223.patch" )
-- 
2.7.1