Fix missing include string.h in gdk-pixbuf/io-png.c for strcmp, strlen and strncmp (revealed by the libpng16 upgrade) wrt #466034

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 36 insertions, 7 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 00032d6e6f09..52188d3a8a55 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.82 2013/03/28 15:57:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.83 2013/04/15 22:50:10 ssuominen Exp $
+
+  15 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.28.0.ebuild,
+  +files/gdk-pixbuf-2.28.0-string_h.patch:
+  Fix missing include string.h in gdk-pixbuf/io-png.c for strcmp, strlen and
+  strncmp (revealed by the libpng16 upgrade) wrt #466034
 
 *gdk-pixbuf-2.28.0 (28 Mar 2013)
 
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index fdface8059bc..9adb28e67e66 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX gdk-pixbuf-2.24.1-xbm-overflow.patch 1534 SHA256 97d2dcde3312ec2ad15f26a91cb3af9538db8218acccef69e32fa888802e007e SHA512 39c80fc9fc2c16e99db44292b52dd8272abd4b58b2c0d736280e12d2fc5f7c57d959194b976676d79fafcf1a6c43af5ee2fa6d3999ffe72533f61e6846aee89b WHIRLPOOL 994c3f4420184a077ea999c95e2f9355f9842ff3bb651fe1b5ccdbc3a34aa330c751163fb3850c38199ed79db3ae7e0fba97ed8bd9c7ceb26ba335c13b19035b
+AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35ca6d7d33350f7b5721dc06d88a7dc2a6 SHA512 54e7248076cdb1d446b5bb5ee09474461c775a0e51372602f10b0096f5c4779f01c739c75461d2c134565dacc03a38f298486ce814df8318410c8ab77ca5a8a7 WHIRLPOOL be4193a8e83733c031629d3a67e690b740180c9ac20eaac424119a3381a558c2b233524c599536276fe97b541f2d9d824dafa1642099b246a87df5deea497083
 DIST gdk-pixbuf-2.24.1.tar.xz 1177036 SHA256 da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1 SHA512 93f86369fb050f4e564163bf516d9a4769b3b0f011416c891be9811520835d4fea007641b27939aa2eaa6d38f07ab53cc5635a20f9befd94824924ae38abac19 WHIRLPOOL 1254c823afc85b7ae02d1adb3b98775b89d7482070447d75419bd7886b1be11867f8b21668684dc7ce912ba48816a4b85d7d24bf65b6f1cde92ff83c6e5a7961
 DIST gdk-pixbuf-2.26.4.tar.xz 1181640 SHA256 a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be SHA512 a85d9fb8a206b6986abc8bc8caa079f5ddbd1c83226f80896439a06a7644d27fa1e9d80cc0a34ba82ce0877cdfaeaee8bc2548b016d25d314bcbbab44091ef76 WHIRLPOOL f452673a3d4b9e894d7e92a24ecca9c4551353d38c242ad7ddcde812ce55dd56b68d80b297957c3f3cd7a649837cd47412995b842082ae5abec81a02ec486b07
 DIST gdk-pixbuf-2.26.5.tar.xz 1181336 SHA256 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 SHA512 2988dd550aac92c2633c5443c712be8e3c06d852190251d6436ef2457c43ccce48ef795f7b187ef975b643a0bc4fc407f8b539fd627dc05a69d7ee4b210244ee WHIRLPOOL 2a05fb5501a72fcb4acb502c542509a845406b1905e7750097de2c555dc5222b903bb7f1d4e953fdf19e4d6dd1b7acae6f6bceadcd26687d3b628f8c4cc654da
@@ -9,13 +10,17 @@ DIST gdk-pixbuf-2.28.0.tar.xz 1191004 SHA256 561e37695bfb1b07549588b3fca2e6f05b2
 EBUILD gdk-pixbuf-2.24.1-r1.ebuild 2819 SHA256 6679884e054e73b5961ea9d00ef00ba1f332042de7dba28f1041ce236f150058 SHA512 2b00ea9b735e123cc3713122b72f705a6dcfd00f76de48222e45301ab7c3b199d7fa1cc9e8927c23e4f2f6d81b6a63145a2d1bd5e56314bc49fdd0f112d76dc1 WHIRLPOOL 2d61b8cdd56591791e8b9c1e3237f7a81b50d49016dc55ceebf77030c1d0cdb947cf992f1bae90125a8747b08c33243ebd2c7306e9afe76b69fd4fdfafc81b49
 EBUILD gdk-pixbuf-2.26.4.ebuild 2726 SHA256 92bd3d457c198bcaf6ec39b50bde8c4dcc39068b45576db114b8179ada3ffd31 SHA512 978f942e59477f7b79eacaf255f316fc3492000cd4626d2692d993fc1351f32b60ceb1628ec99b1cc6b86481b129a57546cb4be13372bb7be563693ea49cfecf WHIRLPOOL 777237cd8eda4dc8a9e58898d1d9ab78e22c7b9d76e59201f368681e603ca7f2b7351392cf22cb23d4ea7e2dc562c9df77b5d1897640325f03651b99f9d0c0b3
 EBUILD gdk-pixbuf-2.26.5.ebuild 2645 SHA256 fd6fe64eccbea2c3c05fc33480c1215a3ce4059dab817da1337628100d38dc87 SHA512 3019182523321f698bb0480734993954afcc2df4edfb272fb203bfce98bde949c83e8f16ac90253950dd1ec1db216d7bbeceb1ee9345abddd1c3015f8ac78a6c WHIRLPOOL 484db42afc5e3c8f0d9d80dfc704aa7a8bddfa80d39270bdcdbfe745066c0e60834673956f42dd6dd0f1e1e64a61f1e97d2fcc552ccbebc9baa73516698239b3
-EBUILD gdk-pixbuf-2.28.0.ebuild 2609 SHA256 ee8a2ffe1fb2031106a5b5c76b3045693a862f1c6799428adb3dd052e52c1ba7 SHA512 72861229816351e257f7edc58b893700506d80d0d2a0d77e8c43e45f0c3f3ed9cc0c17a99a8b77b5b9a2c10bd6b140b6b53b46a20d4e2e5baef7320ad018338b WHIRLPOOL 416a8911840fab536bf850b393d8f37122e2e7f63e83017f3ac2c66607a83b1ec6dad2f588305d6193b8c46cf3b5f5bc0ccfec27a8650be00e35394d54bc8551
-MISC ChangeLog 12220 SHA256 b6eb8d10d560a9b7b99e2c4d44ef69d5a473d360637eb7b24da278459efd0fb8 SHA512 e62c29be98cbfc91cd2db5df0b1f5405d62b89cf71b96b7789122fae946119dd64ebd2ad16cddf77c237d3ee3586a215db36a888c60bab47b6a74994f9ca7c29 WHIRLPOOL 2209fea0769ff63fb89c2047313301c3c862be103c4a4e332ee6f562021eed9dfef2725726b20d7d16e5eac3c0bcedd3ff0fe61176f28002e7c8062e9315840d
+EBUILD gdk-pixbuf-2.28.0.ebuild 2663 SHA256 515cac0b0cb7cdfa9f1e8cfbe8138a336c3d6669c541fd15a7fb2d93a19a497c SHA512 09d2e7eb0ac351736d06c2d2c99759237bef2172a8d77473575d08a3e67e68612b07153475ed07ff8c5cc774f0b9f360ab4b80b59fd5cd4f731db25a9b2811c2 WHIRLPOOL 5b5bec195969238ec7ba4b92b05d186e1f8e420c271a4022434c8d3d42563696223f7e431782d14671978d17a66f0f174019a273a5bca02c74f6b808ba6ce6e7
+MISC ChangeLog 12482 SHA256 1ef4cd8ff43616eeadea45dc677c5090420d0fcbdd6099bd2d3aa06a299dcfa1 SHA512 05a92b38548f2b71e13132b3244471d8ee1acd508c425dfdba74f1f9a0a5b5aaa1f3c4c9944597e862eaeaac2c40a0b0bba784b53485f87099752ea9c675abeb WHIRLPOOL 030d2804baccbdaf0cdef02acc1bf129ea43e35ad6902cf9e6d8caf6b97d061ddde60db0a4124b86722c3a5d86e7d049fa19bce893e92ca21d6d8079be24f2dc
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUaIgACgkQCaWpQKGI+9SkEACeP9RFgTIerHIQUwKrrP+AWvs7
-mgQAmgNAms2ukOH0ndNgzd0ww/DFalnj
-=Vi0M
+iQEcBAEBCAAGBQJRbIQCAAoJEEdUh39IaPFNeckH+gMeDS2wLCLeZl+kX4jO5lNv
+DGB5PCmt2L5BCDZX2JMmGlUgL7ZBaPIRPGkdL9kw5YtP8stR/3UCV2QQkHmujRZ+
+k1+zzBzWLzfeGCMghbZoZGGvLWkYiwf7COZcvfEUl16TLuEQsqcPtC+nOEz1Cs1z
+M3kNSlnpcC2KJs+JHszseOXVh7JSZlsdSlJwO0v9f6M4c44jw7vZzt3zy9zarnCM
+/y5rk8qwnvQWTLNQKzscj0E3VeRnPW+fTjEu9qoaswalJJE2/DSlUyh/rGBItWfM
+YouK6gJleUg72fx2ZlUiWNqf0Y20JnFO+6hctSlJBU+qvhg9OWJ0ikqmGzP6E2k=
+=V3Cp
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch
new file mode 100644
index 000000000000..ecb60c512c4d
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/466034
+
+851:24: warning: implicit declaration of function 'strncmp' [-Wimplicit-function-declaration]
+853:32: warning: implicit declaration of function 'strlen' [-Wimplicit-function-declaration]
+873:24: warning: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration]
+853:46: warning: incompatible implicit declaration of built-in function 'strlen' [enabled by default]
+944:58: warning: incompatible implicit declaration of built-in function 'strlen' [enabled by default]
+
+--- gdk-pixbuf/io-png.c
++++ gdk-pixbuf/io-png.c
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h> /* strcmp, strlen, strncmp */
+ #include <png.h>
+ #include "gdk-pixbuf-private.h"
+ 
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild
index 83b786a72bd7..5fc7c267fa23 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild,v 1.1 2013/03/28 15:57:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild,v 1.2 2013/04/15 22:50:10 ssuominen Exp $
 
 EAPI="5"
 inherit eutils gnome.org multilib libtool
@@ -33,6 +33,7 @@ RDEPEND="${COMMON_DEPEND}
 	!<x11-libs/gtk+-2.90.4:3"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-string_h.patch #466034
 	# This will avoid polluting the pkg-config file with versioned libpng,
 	# which is causing problems with libpng14 -> libpng15 upgrade
 	# See upstream bug #667068