x11-libs/gtk+: update non-bash patch

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x901AB08A

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 556c28cd7eb9342d0f9ba75f20dee4558a091f56..d71a21c6edb56904f7ef81148b6c74024e4c8cae 100644 (file)
--- 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+/Manifest b/x11-libs/gtk+/Manifest
index 012734435b1d6c4c5e758ed9c21f6a1ea8134469..10fc37022c6a8db24f265a25deafa3b758dfcbd6 100644 (file)
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -11,7 +11,7 @@ AUX gtk+-2.24.20-darwin-quartz-pasteboard.patch 435 SHA256 3eaf1b2f534309344f046
 AUX gtk+-2.24.24-out-of-source.patch 1487 SHA256 3492f3c22df40f7e0696098eb689b949ce0b6152293aba0a54adb8a859ec5250 SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2 WHIRLPOOL abc0a7572bd27afc3d4b0d0dbae78e93ebfec8c8bbc6787c632de80401d4f0b9f6621ccb0fbae867a70cea8767f97542b7c42c9f532598676d89563677cd79d3
 AUX gtk+-3.12.2-builtin-icon.patch 916 SHA256 ab655e9de25bc30698312108a87f15ce208004b38800ae802e62133007197758 SHA512 a12d25e92854c0e73ada4edf4ef26ccde18c052c229c2de1ab03feb26759452de804d44c51954584e68aa42ae0fae3c254aae19fd50bf999e6eda2c0c619f467 WHIRLPOOL 2077652a65be2073193cbb6f3fdcf5de7f5c1474cd98bf464b5a6adcca560fb5fc4f86f0ba50fd6da387fdd18c5fde53b4a1395ce3b9ec34f981b376e5f149da
 AUX gtk+-3.12.2-darwin10.6.patch 1269 SHA256 ecda99fd1a105c09843183b1a2709c605d7c5129f2985fd8a29d32b967eb8537 SHA512 2dafca048fba34f1b06430cc70e90b148dfc325e67dbe90195440609adb60fa4bdea9cb7dd0d16cf039452151271bf137e9c3ea8277a8795e3d0cd719bbc05aa WHIRLPOOL c464c8b573e256b44552150b8bc7be43e2c7112d5a0032be452323bd914830b7b35f04f6240c2ba8d696161753df19ffd7a6ac20626299392877e4e06bc10d5e
-AUX gtk+-non-bash-support.patch 684 SHA256 10d78bb162ae0d0848dca373dfef51e4d3243dc4b9e3811bf7f95201ad935a93 SHA512 89b8dec809bed98cc1f9ebf2016e5c6798a4d91fa2c7e0e767f9a88df57bbfeea4c8b20ff1cc1e9044fd0c939fc11ed93e87f985a361386e709dd2c46e3ecc3a WHIRLPOOL 72175e80c553206a6d636f319b1c58d441315c5259c0f3e88f9fc7c6c66a42badea2159e7ee8c3de824e42124a2a6bb1d72f7055eb9a2fa878fafb85515a2c94
+AUX gtk+-non-bash-support.patch 1514 SHA256 aec9ba37229e815567334d08f744a753f958aead7c36c1fa2d06fafbd932331b SHA512 1dee689b62721aa87e13fe44d25fe6182665813d9d5a34ca1fd2ffdecafb66cc00d2608be0d73731b99431c9668aabe09af7ab26b422a02d2872ca55cd928811 WHIRLPOOL ccdc0db37942e43e255cea362bda6cab2e748f9bc98a4781595d19952d85541415cf50c0ad3339abc37254be8eb266bf8729c2b2b7c4b06dd93e4784a9152571
 AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
@@ -27,13 +27,13 @@ EBUILD gtk+-2.24.26.ebuild 9942 SHA256 5897b82870937129a465492b48b949e047288c54d
 EBUILD gtk+-3.12.2-r2.ebuild 8223 SHA256 ecee6c83c1418c0d69d7f2a21c8219cb9675509d23cfd378455af80b4cb127aa SHA512 5057611b2b8b767bf4ff36a9583e6a1635b470742b6cc429a1876a77af903dae9d1903174062bd01c568b7df9bea4f67f0e2571387fbbd1d409765b5c56653a1 WHIRLPOOL ed6f48b1908ce088dbd4ffe36709772361d80c73de5b247a8996c40ca6fe87eae19a5b61c23a632b91fcbeb53bb4ff8cce4bb841145519737cfa324fceb36626
 EBUILD gtk+-3.12.2.ebuild 6597 SHA256 be97832d070fab365a441ef5b124b803417f8ca1fa1fefd22f17772af6632e7e SHA512 d78b8d1696f16607feb4b2695ae48756cf69ea7704b73a1dda99e6f7aec119e8483c2f4197dba17188131ba9ea9a7fc18d1c97190ff3dd3a1981c3093810cd05 WHIRLPOOL e6435dd7ee84c81b9e5f1fa6b9989b6c0bd62aad8f8e35419a6dce57e174507cf60968441681057dfdcd0924f50de8409881f341253fc0d1421faedfe5a67467
 EBUILD gtk+-3.14.8.ebuild 7964 SHA256 2a9d7f4db57c6b76b8129c5a6dcbdce634743e60a9cbc60e3ea73312612a1bcf SHA512 7c77086381921f24d961921ab086d8df1e5cf4117c0d13776a185a514debb73687d102dd1975d905531b6bc26cac0afcd3a4e4a24823a077612b413d48644d00 WHIRLPOOL ada85eecff6786e23a04f580f85bf1cac0a6f24c97c16bbe4b5ab9c8838117ed3d1dcc268ccdb717d8c31495362b67166dc7e6bd23719aaca891576a3ee71fa8
-MISC ChangeLog 20209 SHA256 001f953cdcfe17a92ab42f78da7744a80d4708b3dcca3037d60f296d49f7ba07 SHA512 8b12f4b382a5c43d5f7371fc9c69690a8981788c83b2eda6fe02ead859caca4bfd2282e88d64a2abb051b1e814f51f0f4da92868e041490615ddf429a8c16269 WHIRLPOOL 7cea68c753b7d2c7cb287a7963fe3b031c012b25f66be9808b6ec03bb28e596808fe30d7bd43ce26c4248f611962c1b173ca055057147bbc32d01adc18a65595
+MISC ChangeLog 20346 SHA256 949f28212eabe9ecadeaa09dfc7c2f49827ce17d565c2e7fda683dd05bf0a6e8 SHA512 74fc10f750d633820cf46b56bd87ca37742cbf53e2f70fdb0e78e0a049d67bc7fa019d9b33a268eeff877de907b2554463258056894cf5718c2d38293674d46f WHIRLPOOL d9ef115a629396dbaeed06d83f5fac5a02d7f65fbd1d9c20a0e5da6e96e86715f820e0a46c073e033347d4ef4cd257fac07059444652921923a1bdf274dfde9f
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 697 SHA256 8b5dc9aa21147f3d0418c8c39c2788b7fb061d0c51ef7631045db65a5dac54d9 SHA512 aaf3748ce89cd5bf1a7839cb73b742d5a8668834727a2ba2b4b4034aac66b616718347818578d96e84b09f104c7c728429ca45c8bfb6806571fd073da1a20ee7 WHIRLPOOL e65be162bc425eb89abffd3ae598c01b7b86a834dbec64f163144ea5faaa32b7d79d239afd9215c51d071b968b3a5acb4ad1bac71eaa7bde2113421e7c8d57fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTkgBoACgkQCaWpQKGI+9TozACfVnUHAiFPN1O5aEEA9/7FUoIe
-QpoAnRHUejoyYy8yfGC5RJhYkxiOxi7j
-=/wdh
+iEYEAREIAAYFAlTpHLsACgkQfUU/I5AasIoHIACg4Wd8Xi8YA1iJg+seHwZ9xe1H
+VOQAoMXapGEjFK/SbmhDaaZTx5ZY4Vg5
+=bRFl
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
index efd13e646280e732b480d7810f97ef22b9309fe5..45df9baac80d6419500bbab5f5b86e5cb1f51b03 100644 (file)
--- 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