Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 574472 | Differences between
and this patch

Collapse All | Expand All

(-)a/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.10.0-grep223.patch (+34 lines)
Line 0 Link Here
1
From 270c9f7c04df37752f52b7e6ac49a9072c16119c Mon Sep 17 00:00:00 2001
2
Message-Id: <270c9f7c04df37752f52b7e6ac49a9072c16119c.1455382175.git.sven.a.jonsson@tele2.se>
3
From: Sven Jonsson <sven.a.jonsson@tele2.se>
4
Date: Sat, 13 Feb 2016 14:58:17 +0100
5
Subject: [PATCH] LXQtTranslateDesktop: adapt to grep 2.23
6
7
---
8
 cmake/LXQtTranslateDesktop.cmake | 6 +++---
9
 1 file changed, 3 insertions(+), 3 deletions(-)
10
11
diff --git a/cmake/LXQtTranslateDesktop.cmake b/cmake/LXQtTranslateDesktop.cmake
12
index 522ed68..7569f03 100644
13
--- a/cmake/LXQtTranslateDesktop.cmake
14
+++ b/cmake/LXQtTranslateDesktop.cmake
15
@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
16
         set(_pattern "'\\[.*]\\s*='")
17
         if (_translations)
18
             add_custom_command(OUTPUT ${_outFile}
19
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
20
-                COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
21
+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
22
+                COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
23
                 COMMENT "Generating ${_fileName}${_fileExt}"
24
             )
25
         else()
26
             add_custom_command(OUTPUT ${_outFile}
27
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
28
+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
29
                 COMMENT "Generating ${_fileName}${_fileExt}"
30
             )
31
         endif()
32
-- 
33
2.7.1
34
(-)a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild (-1 / +2 lines)
Lines 40-45 DEPEND="${CDEPEND} Link Here
40
	sys-devel/gettext
40
	sys-devel/gettext
41
	virtual/pkgconfig"
41
	virtual/pkgconfig"
42
42
43
PATCHES=( "${FILESDIR}/${P}-grep223.patch" )
44
43
src_prepare() {
45
src_prepare() {
44
	# fix multilib
46
	# fix multilib
45
	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
47
	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
46
- 

Return to bug 574472