remi 15/02/22 00:03:06 Modified: gtk+-non-bash-support.patch Log: x11-libs/gtk+: update non-bash patch (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 901AB08A)
Revision Changes Path 1.2 x11-libs/gtk+/files/gtk+-non-bash-support.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-non-bash-support.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-non-bash-support.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-non-bash-support.patch?r1=1.1&r2=1.2 Index: gtk+-non-bash-support.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/files/gtk+-non-bash-support.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk+-non-bash-support.patch 14 Dec 2014 22:42:54 -0000 1.1 +++ gtk+-non-bash-support.patch 22 Feb 2015 00:03:06 -0000 1.2 @@ -1,14 +1,22 @@ -From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <[email protected]> +From dd95441325d038d8e1d766e2b36ee9fb1171424d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <[email protected]> Date: Sun, 26 Oct 2014 01:59:33 +0400 -Subject: [PATCH] gtk/Makefile.am: improve portability of ECHO +Subject: [PATCH] gtk/Makefile.am: Remove bashisms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- improve portability of ECHO +- remove use of shopt +From: Alexander Tsoy <[email protected]> +Signed-off-by: Rémi Cardona <[email protected]> --- - gtk/Makefile.am | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) + gtk/Makefile.am | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index f60bec8..e923940 100644 +index 96c651a..3ef40d4 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings % @@ -24,6 +32,23 @@ if HAVE_CLOUDPRINT if HAVE_PAPI_CUPS +@@ -1405,12 +1401,13 @@ gtk.gresource.xml: Makefile.am + n=`basename $$f`; \ + $(ECHO) " <file compressed=\"true\">ui/$$n</file>" >> $@; \ + done; \ +- shopt -s nullglob; \ + for s in 16x16 22x22 24x24 32x32 48x48; do \ + for c in actions status; do \ + for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \ +- n=`basename $$f`; \ +- $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \ ++ if [ -e "$f" ] ; then \ ++ n=`basename $$f`; \ ++ $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \ ++ fi; \ + done; \ + done; \ + done; \ -- -2.0.4 +2.3.0
