diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2015-02-22 00:03:06 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2015-02-22 00:03:06 +0000 |
| commit | c010bb256f322a0e57ab24938071e895692ce308 (patch) | |
| tree | 189beaa8ecb380d2c8de9160441eff7f565fc122 | |
| parent | Version bump (diff) | |
| download | gentoo-2-c010bb256f322a0e57ab24938071e895692ce308.tar.gz gentoo-2-c010bb256f322a0e57ab24938071e895692ce308.tar.bz2 gentoo-2-c010bb256f322a0e57ab24938071e895692ce308.zip | |
x11-libs/gtk+: update non-bash patch
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 901AB08A)
| -rw-r--r-- | x11-libs/gtk+/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-non-bash-support.patch | 39 |
2 files changed, 37 insertions, 8 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 556c28cd7eb9..d71a21c6edb5 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.761 2015/02/18 12:05:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.762 2015/02/22 00:03:06 remi Exp $ + + 22 Feb 2015; Rémi Cardona <remi@gentoo.org> + files/gtk+-non-bash-support.patch: + Update non-bash patch for 3.14.8, see bug #540952. *gtk+-2.24.26 (18 Feb 2015) diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch index efd13e646280..45df9baac80d 100644 --- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch +++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch @@ -1,14 +1,22 @@ -From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> +From dd95441325d038d8e1d766e2b36ee9fb1171424d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> 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 <alexander@tsoy.me> +Signed-off-by: Rémi Cardona <remi@gentoo.org> --- - 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 @@ index f60bec8..e923940 100644 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 |