Version bump with NetBSD patch for libpng15 wrt #378507 by Diego Elio Pettenò

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

4 files changed, 93 insertions, 3 deletions

diff --git a/media-gfx/gif2png/ChangeLog b/media-gfx/gif2png/ChangeLog
index 03b7eaf2fe06..e60654efa8c4 100644
--- a/media-gfx/gif2png/ChangeLog
+++ b/media-gfx/gif2png/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gif2png
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.23 2010/12/10 19:39:25 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.24 2011/08/09 15:28:37 ssuominen Exp $
+
+*gif2png-2.5.4 (09 Aug 2011)
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +gif2png-2.5.4.ebuild,
+  +files/gif2png-2.5.4-libpng15.patch:
+  Version bump with NetBSD patch for libpng15 wrt #378507 by Diego Elio
+  Pettenò
 
   10 Dec 2010; Brent Baude <ranger@gentoo.org> gif2png-2.5.1-r1.ebuild:
   Marking gif2png-2.5.1-r1 ppc64 for bug 346501
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 98c7bb46ed5c..94e214def1cb 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gif2png-2.5.1-libpng.patch 1039 RMD160 49843e5d1a2d6507cb13e4ece5221b519f9f9fc0 SHA1 5937ca7e69959baf1ab51e292f845d72dd822577 SHA256 ec32dc18cf4607ddc92e172702daab3150c1e1c913437f159f2ee0724dff69f6
 AUX gif2png-2.5.1-overflow.patch 1247 RMD160 6a31529218a34d5d6cfc64fbae6076226acaf79e SHA1 821730cb89b72cb3df3829b6baa35bfe72b538a0 SHA256 3a0a7f10152489fd4875332459bb9a226dbb3eff166043e8481fb402b46a1c24
+AUX gif2png-2.5.4-libpng15.patch 1390 RMD160 47e9c7b674565fe13ee0d30ebc7d781623622b47 SHA1 30e5b0da688d216f869bf914f069286674f5eaa0 SHA256 5f5be172c09184e6e2d779401f9234184b9a4abf87ecacedec231c4cd6ee4009
 DIST gif2png-2.5.1.tar.gz 104449 RMD160 64dfd73ef988a1f45f221abf6cfbf2e790f42ea3 SHA1 682f3dc2849ed1e938c12459eb089247aee09a2b SHA256 90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89
+DIST gif2png-2.5.4.tar.gz 125731 RMD160 372a56e260957a7f8895322904f3691df7e56d7e SHA1 40a33457e5d2beb0f001c14fabf0e92533c38450 SHA256 0d78eb568198b568f7c1f535b9ec74fc6546864de11f57924c8e8db510423fef
 EBUILD gif2png-2.5.1-r1.ebuild 798 RMD160 813789d459665fc9dabefee5a229bcf84b0dd03d SHA1 a0fa11a0fe8c74227332f6cc2a2af7e3bab5f256 SHA256 083ac36326087d8163d3b80b95d51ec632b8c91add78e36b9e1d1961efa0ba8e
 EBUILD gif2png-2.5.1.ebuild 781 RMD160 a6dbf1f65917c645e22798ed96376e84ed6d938e SHA1 42110f1391a6a033923c46bcf59be261fdf4c4d4 SHA256 12be86c3ab6a7744b28d5d0a4890cffa08f177be13d98df683c1f6dcb4c085a3
-MISC ChangeLog 3007 RMD160 8bf4789b7e33ca47ee0737126b447092cb69ee22 SHA1 c4d508df89c4231f569e20d2f9b4c243ff04fa12 SHA256 23c071016e9e46f7a27358acd1fe7bedc39fb701bc40c0e540f86573991314c2
+EBUILD gif2png-2.5.4.ebuild 727 RMD160 c123401d3df789afeed497daca07478d80088b31 SHA1 123851bd1916eae157d9f87a3a51eeda675ddf77 SHA256 29f91d2cb736a35575cf3d38ab49bede3a91149c2b9f0e33d45dcdd53f1f092a
+MISC ChangeLog 3240 RMD160 e7f82ab9936116215612f518787d492978cc3c23 SHA1 266d8a95ce55dc5ffc7c7a53349d28607e940bc6 SHA256 4544e3ff1dd28e3d1c9ae592d64e87216a4543c36a11cda3844f03222893e480
 MISC metadata.xml 223 RMD160 06142079e0afba051758f76a7ef850183217e8a4 SHA1 2dd01d07170c2cf8b971ff1c98060ed021f11abb SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5BUh0ACgkQXkR9YqOcLPE7KQD+N8c3NfBSiBLv8t4kFdbiaJqz
+r59MWn6YAlD12QmUIpAA/30+NVEA5/W6cqJCAzITSNbns+enUV5Ksh0pO5a1P9YV
+=py1X
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gif2png/files/gif2png-2.5.4-libpng15.patch b/media-gfx/gif2png/files/gif2png-2.5.4-libpng15.patch
new file mode 100644
index 000000000000..9e5c333bba43
--- /dev/null
+++ b/media-gfx/gif2png/files/gif2png-2.5.4-libpng15.patch
@@ -0,0 +1,43 @@
+ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa
+
+--- gif2png.c
++++ gif2png.c
+@@ -10,6 +10,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>	/* for isatty() */
++#include <zlib.h>
+ 
+ #if !defined(TRUE)
+ #define FALSE	0
+@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc
+     int colors_used = 0;
+     byte remap[MAXCMSIZE];
+     int low_prec;
+-    png_struct *png_ptr = xalloc(sizeof (png_struct));
+-    png_info *info_ptr = xalloc(sizeof (png_info));
++    png_struct *png_ptr;
++    png_info *info_ptr;
+     int p;
+     int gray_bitdepth;
+     png_color pal_rgb[MAXCMSIZE], *pltep;
+@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc
+     png_text software;
+     png_text comment;
+ 
++    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
++    if (png_ptr == NULL) {
++      fprintf(stderr, "gif2png: fatal error, out of memory\n");
++      fprintf(stderr, "gif2png: exiting ungracefully\n");
++      exit(1);
++    }
++    info_ptr = png_create_info_struct(png_ptr);
++    if (info_ptr == NULL) {
++      fprintf(stderr, "gif2png: fatal error, out of memory\n");
++      fprintf(stderr, "gif2png: exiting ungracefully\n");
++      exit(1);
++    }
++
+     /* these volatile declarations prevent gcc warnings ("variable might be
+      *  clobbered by `longjmp' or `vfork'") */
+     volatile int gray = TRUE;
diff --git a/media-gfx/gif2png/gif2png-2.5.4.ebuild b/media-gfx/gif2png/gif2png-2.5.4.ebuild
new file mode 100644
index 000000000000..4bcf372dea14
--- /dev/null
+++ b/media-gfx/gif2png/gif2png-2.5.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.4.ebuild,v 1.1 2011/08/09 15:28:37 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Converts images from gif format to png format"
+HOMEPAGE="http://catb.org/~esr/gif2png/"
+SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.4
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.5.1-overflow.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+}