Add suport for libpng 1.5 in stable, thanks to ssuominen. Closes bug #389363

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 34 insertions, 11 deletions

diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 335a38ed76c3..5dd7c9978e63 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.90 2011/08/10 09:08:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.91 2011/11/04 15:06:49 voyageur Exp $
+
+  04 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  gnustep-gui-0.18.0.ebuild, +files/gnustep-gui-0.18.0-libpng15.patch:
+  Add suport for libpng 1.5 in stable, thanks to ssuominen. Closes bug #389363
 
   10 Aug 2011; Fabian Groffen <grobian@gentoo.org> gnustep-gui-0.20.0.ebuild:
   Remove -Werror from OBJ_CFLAGS, bug #378179
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 1228435aa58b..12febb8eaa9f 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX gnustep-gui-0.18.0-libpng15.patch 352 RMD160 9c7ce8dcfcb2659cfe2da946a24254bd51d0747f SHA1 d9ed0c7c70e14ea06adc82f7ecf2e8aa1178d3b2 SHA256 9d93e5fd54411bc25923bd258b740e46e6ba1f7e7728fad94a976eb8074e430f
 DIST gnustep-gui-0.18.0.tar.gz 2520596 RMD160 38f938d1ed2d98e351eb5c6d325bd4782ef2c3fb SHA1 f78e2b03c05bb6b5f40d6b1ec129835f758f1947 SHA256 bcf4d9a112aa7045ae2bb06461e7a6660821eaae93eee337fb1236f3b2535ab6
 DIST gnustep-gui-0.20.0.tar.gz 2648224 RMD160 3a5ef7fa61d0a192e036866a19749b7a6dfadc82 SHA1 e86f37ed35fbaae5cb00fc635cbb763eebbdbd7e SHA256 26f28951f07c0abb5439f468b60a6726168c510ae3579cd075e6a9c5bab73f5a
-EBUILD gnustep-gui-0.18.0.ebuild 1401 RMD160 cb2f4dc23d43ed14c697c5fd271ffe4afe21d2b1 SHA1 fc6edc9cd6fd7c14eb0936728f604cadd9e719d5 SHA256 1878abf07755846e359e2c77e9df01d99e0ac338662344759eb2e445befc60fb
+EBUILD gnustep-gui-0.18.0.ebuild 1495 RMD160 ccf66cd2735d87f2fd0db94dc8a9cf1239f32773 SHA1 87765d8769a09c26f19d09d143b083274cce7e4d SHA256 5ec9a28b2c3de969cd7e9a0418a46466121b33bd18693130052e06adc2fc4c5f
 EBUILD gnustep-gui-0.20.0.ebuild 1587 RMD160 3fc4716d24e233ee58c4e6d0253551b399cdb135 SHA1 d6dab3e3e6f122d10a60bc6b21cef56e49299281 SHA256 7e6a6dfadc205e7eca8f2ddf5970a02590334ed150a002961092ab91f27aea69
-MISC ChangeLog 16427 RMD160 d3cbe689aec26a6b07fe5b24c8a0555ebcdaba52 SHA1 529ffbfcdeeb0c97d8ce15d51c49de325f266a4a SHA256 38b8144413d5164c1ddaf50207738c07037376a5846ae882b2f79455ae08dca6
+MISC ChangeLog 16634 RMD160 2285c5fa521abfef71483e21d9ea25571c7caf67 SHA1 ca18242b17c75a6b0b2a56c575367e59a6205884 SHA256 f24099647ef000813bc23704bf50ada169043b3e7acd6acd7a47a1409752c82b
 MISC metadata.xml 1355 RMD160 827c24953436fc2f6f00e6ed106dce431340ec35 SHA1 68cacccc861155f0ae65177787811fd66eb61579 SHA256 25cc768361f0311d0356e24a68dda7f1cee30c717644cb37884440e6ad0b976b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5CSncACgkQX3X2B8XHTonjSACfUx1vyh8Vg9dK9BXB9Z/i7rO7
-J8QAoIGBMf3YI1iUh+ANjNCnfS+09KxF
-=G17C
+iF4EAREIAAYFAk6z/5QACgkQFYEBGcdFJfKthAD7BJ0+HSIIyvh2jUaoMqBbPsO4
+jVO55GsMlZanM39il9cBAImL62cI8Gc4Xqoo+tYRN80U+8WUGBlphjgkQ8c8mqTn
+=uyUZ
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-gui/files/gnustep-gui-0.18.0-libpng15.patch b/gnustep-base/gnustep-gui/files/gnustep-gui-0.18.0-libpng15.patch
new file mode 100644
index 000000000000..80f90b552801
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/gnustep-gui-0.18.0-libpng15.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/389363
+
+--- Source/NSBitmapImageRep+PNG.m
++++ Source/NSBitmapImageRep+PNG.m
+@@ -229,7 +229,7 @@ 
+     initWithBytesNoCopy: buf
+ 		 length: bytes_per_row * height];
+ 
+-  if (PNG_INFO_gAMA & png_info->valid)
++  if (png_get_valid(png_struct, png_info, PNG_INFO_gAMA))
+   {
+     double file_gamma = 2.2;
+     if (PNG_FLOATING_POINT)
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild
index dbc2b21f7304..731f46974d4d 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild,v 1.7 2010/11/08 13:21:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.18.0.ebuild,v 1.8 2011/11/04 15:06:49 voyageur Exp $
 
 EAPI="3"
 
-inherit gnustep-base multilib
+inherit eutils gnustep-base multilib
 
 DESCRIPTION="Library of GUI classes written in Obj-C"
 HOMEPAGE="http://www.gnustep.org/"
@@ -28,6 +28,11 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
 	app-text/aspell"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+	gnustep-base_src_prepare
+}
+
 src_configure() {
 	egnustep_env