diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2015-02-22 00:22:31 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2015-02-22 00:22:31 +0000 |
| commit | 0b85e71e2d866a27466fce34be588d133bad5682 (patch) | |
| tree | 2c3ba144025da179d412ce462a251be5d8a71c67 /x11-libs/gtk+ | |
| parent | add version 1.4.0 (diff) | |
| download | gentoo-2-0b85e71e2d866a27466fce34be588d133bad5682.tar.gz gentoo-2-0b85e71e2d866a27466fce34be588d133bad5682.tar.bz2 gentoo-2-0b85e71e2d866a27466fce34be588d133bad5682.zip | |
x11-libs/gtk+: tweak non-bash patch
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 901AB08A)
Diffstat (limited to 'x11-libs/gtk+')
| -rw-r--r-- | x11-libs/gtk+/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-non-bash-support.patch | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index d71a21c6edb5..df30a08fa6e3 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.762 2015/02/22 00:03:06 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.763 2015/02/22 00:22:31 remi Exp $ + + 22 Feb 2015; Rémi Cardona <remi@gentoo.org> + files/gtk+-non-bash-support.patch: + Tweak non-bash patch. 22 Feb 2015; Rémi Cardona <remi@gentoo.org> files/gtk+-non-bash-support.patch: diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch index 45df9baac80d..a1aac42c9f91 100644 --- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch +++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch @@ -1,4 +1,4 @@ -From dd95441325d038d8e1d766e2b36ee9fb1171424d Mon Sep 17 00:00:00 2001 +From 43a4a28cdc60ac7347bb89f84cf049cb3401621d 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: Remove bashisms @@ -9,6 +9,8 @@ Content-Transfer-Encoding: 8bit - improve portability of ECHO - remove use of shopt +https://bugzilla.gnome.org/show_bug.cgi?id=738835 + From: Alexander Tsoy <alexander@tsoy.me> Signed-off-by: Rémi Cardona <remi@gentoo.org> --- @@ -16,7 +18,7 @@ Signed-off-by: Rémi Cardona <remi@gentoo.org> 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 96c651a..3ef40d4 100644 +index 96c651a..b1478ce 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings % @@ -42,7 +44,7 @@ index 96c651a..3ef40d4 100644 for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \ - n=`basename $$f`; \ - $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \ -+ if [ -e "$f" ] ; then \ ++ if [ -e "$$f" ] ; then \ + n=`basename $$f`; \ + $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \ + fi; \ |