Add patch from bug 139338 to allow compilation with libpng-1.2.12. Thanks to Michael A. Smith <michael at smith-li dot com>, Andre Hinrichs <andre.hinrichs at gmx dot de> and Nick Devito <nick125 at gmail dot com>.

Package-Manager: portage-2.1-r1

5 files changed, 67 insertions, 22 deletions

diff --git a/media-gfx/gif2png/ChangeLog b/media-gfx/gif2png/ChangeLog
index 77e170d6fb4c..9a30ef314f93 100644
--- a/media-gfx/gif2png/ChangeLog
+++ b/media-gfx/gif2png/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gif2png
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.13 2005/09/11 01:53:51 vanquirius Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.14 2006/07/08 21:37:19 vanquirius Exp $
+
+  08 Jul 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/gif2png-2.5.1-libpng.patch, gif2png-2.5.1.ebuild:
+  Add patch from bug 139338 to allow compilation with libpng-1.2.12. Thanks to
+  Michael A. Smith <michael at smith-li dot com>, Andre Hinrichs
+  <andre.hinrichs at gmx dot de> and Nick Devito <nick125 at gmail dot com>.
 
   11 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -gif2png-2.4.6.ebuild,
   -gif2png-2.4.7.ebuild, gif2png-2.5.1.ebuild:
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 3c3784fb487b..9cf7d7c24a18 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,22 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 79908e01e7319552fa65c36299d838e9 ChangeLog 1617
-RMD160 5c5c7215ef12b825f42043b301bffd1d39cf99bc ChangeLog 1617
-SHA256 c741a1f52bb7f987d368df1895a99c4c5b35ebd3a37ca8d94a03d5d158ee5e94 ChangeLog 1617
-MD5 4fc0f6cac09879cc1e97b2a16ce32daf files/digest-gif2png-2.5.1 65
-RMD160 781f3824e5f4a1be5b7b41b35e61960973d9cab6 files/digest-gif2png-2.5.1 65
-SHA256 bedcfe656c733d7582b508ae25e5a93a6e4769c1158c9942ceda691616aa5054 files/digest-gif2png-2.5.1 65
-MD5 88cbbf1ea762b2423e1aad2e9f5c9b96 gif2png-2.5.1.ebuild 597
-RMD160 09b81ece2a417d262f1ac8486b16cd51d84a9c76 gif2png-2.5.1.ebuild 597
-SHA256 d02163f9dd2f5653153143d5f497f6c5aada0ec95f98056da0f4d3bbe11d26bd gif2png-2.5.1.ebuild 597
+AUX gif2png-2.5.1-libpng.patch 1039 RMD160 49843e5d1a2d6507cb13e4ece5221b519f9f9fc0 SHA1 5937ca7e69959baf1ab51e292f845d72dd822577 SHA256 ec32dc18cf4607ddc92e172702daab3150c1e1c913437f159f2ee0724dff69f6
+MD5 0febd590ff529fbbb8be040b057349b2 files/gif2png-2.5.1-libpng.patch 1039
+RMD160 49843e5d1a2d6507cb13e4ece5221b519f9f9fc0 files/gif2png-2.5.1-libpng.patch 1039
+SHA256 ec32dc18cf4607ddc92e172702daab3150c1e1c913437f159f2ee0724dff69f6 files/gif2png-2.5.1-libpng.patch 1039
+DIST gif2png-2.5.1.tar.gz 104449 RMD160 64dfd73ef988a1f45f221abf6cfbf2e790f42ea3 SHA1 682f3dc2849ed1e938c12459eb089247aee09a2b SHA256 90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89
+EBUILD gif2png-2.5.1.ebuild 763 RMD160 316bd2a7e43fdbd502eddb293feafa3245d43f17 SHA1 7c7cd9e89dcd1660dc290ad891d2d984d43ee94b SHA256 3af7ff8874f363bab71c379faf215e921c6f11ad49fb3edaf259073d55aeea10
+MD5 01bc0566b180ab203d76ec1424736e3d gif2png-2.5.1.ebuild 763
+RMD160 316bd2a7e43fdbd502eddb293feafa3245d43f17 gif2png-2.5.1.ebuild 763
+SHA256 3af7ff8874f363bab71c379faf215e921c6f11ad49fb3edaf259073d55aeea10 gif2png-2.5.1.ebuild 763
+MISC ChangeLog 1950 RMD160 341a9f0b92a056f85941085a3c4afba13e6592cb SHA1 3a6b565c21d00771e7de5cc893c87f7b68923504 SHA256 b85522db196a049d429e2be2024da74f58beb8295a944c912d58271c393c8f85
+MD5 00e846592351ea6645a34891afcdf836 ChangeLog 1950
+RMD160 341a9f0b92a056f85941085a3c4afba13e6592cb ChangeLog 1950
+SHA256 b85522db196a049d429e2be2024da74f58beb8295a944c912d58271c393c8f85 ChangeLog 1950
+MISC metadata.xml 223 RMD160 06142079e0afba051758f76a7ef850183217e8a4 SHA1 2dd01d07170c2cf8b971ff1c98060ed021f11abb SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576
 MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
 RMD160 06142079e0afba051758f76a7ef850183217e8a4 metadata.xml 223
 SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576 metadata.xml 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHhS+2+ySkm8kpY0RAmkTAJ9BDWp9hHq0gKewwCPau7Vt4egMOQCgprN8
-nFz0ZtbPgUhnjuHeEW0TSoU=
-=BBPK
------END PGP SIGNATURE-----
+MD5 fb45749b447b297bb4ad88a4a1a423cf files/digest-gif2png-2.5.1 241
+RMD160 8cc40d9fa2425f85b5cb13bc20b1e03dede86288 files/digest-gif2png-2.5.1 241
+SHA256 f9a2a632fae8321b6f8bb161a4d50fc30ab80aa60428200932818babd81fc5df files/digest-gif2png-2.5.1 241
diff --git a/media-gfx/gif2png/files/digest-gif2png-2.5.1 b/media-gfx/gif2png/files/digest-gif2png-2.5.1
index ad76e5b3b6a0..9eae3cc243db 100644
--- a/media-gfx/gif2png/files/digest-gif2png-2.5.1
+++ b/media-gfx/gif2png/files/digest-gif2png-2.5.1
@@ -1 +1,3 @@
 MD5 85bb8ee345fc41c218de19dda0164806 gif2png-2.5.1.tar.gz 104449
+RMD160 64dfd73ef988a1f45f221abf6cfbf2e790f42ea3 gif2png-2.5.1.tar.gz 104449
+SHA256 90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89 gif2png-2.5.1.tar.gz 104449
diff --git a/media-gfx/gif2png/files/gif2png-2.5.1-libpng.patch b/media-gfx/gif2png/files/gif2png-2.5.1-libpng.patch
new file mode 100644
index 000000000000..e4ceaebb115f
--- /dev/null
+++ b/media-gfx/gif2png/files/gif2png-2.5.1-libpng.patch
@@ -0,0 +1,30 @@
+--- work/gif2png-2.5.1/gif2png.c.orig	2006-07-07 16:40:33.000000000 -0400
++++ work/gif2png-2.5.1/gif2png.c	2006-07-07 16:43:25.000000000 -0400
+@@ -135,7 +135,7 @@
+     unsigned long hist_maxvalue;
+     int passcount;
+     int errtype, errorcount = 0;
+-    png_text software;
++    png_text comment, software;
+ 
+     /* these volatile declarations prevent gcc warnings ("variable might be
+      *  clobbered by `longjmp' or `vfork'") */
+@@ -517,10 +517,15 @@
+ 	    j = s->size;
+ 	    if (j > 0 && data[j-1] == '\0')  /* some apps include a NULL in GIF comment */
+ 		--j;
+-	    if (j<500) {
+-		png_write_tEXt(png_ptr, "Comment", (png_charp)data, j);
++      if (j<1000) {
++        comment.compression = PNG_TEXT_COMPRESSION_NONE;
+ 	    } else {
+-		png_write_zTXt(png_ptr, "Comment", (png_charp)data, j, 0);
++        comment.compression = PNG_TEXT_COMPRESSION_zTXt;
++        comment.key = "Comment";
++        comment.text = data;
++        comment.text_length = j;
++
++        png_set_text(png_ptr, info_ptr, &comment, 1);
+ 	    }
+ 	    break;
+ 
diff --git a/media-gfx/gif2png/gif2png-2.5.1.ebuild b/media-gfx/gif2png/gif2png-2.5.1.ebuild
index a83b28f32e22..5646a4a1ebc4 100644
--- a/media-gfx/gif2png/gif2png-2.5.1.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.1.ebuild,v 1.12 2006/03/20 02:33:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.1.ebuild,v 1.13 2006/07/08 21:37:19 vanquirius Exp $
+
+inherit eutils
 
 DESCRIPTION="Converts images from gif format to png format"
 HOMEPAGE="http://catb.org/~esr/gif2png/"
@@ -13,6 +15,13 @@ IUSE=""
 
 DEPEND="media-libs/libpng"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bug 139338 - gif2png won't compile with libpng-1.2.12
+	epatch "${FILESDIR}"/${PN}-2.5.1-libpng.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README