Version bump.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 76 insertions, 2 deletions

diff --git a/media-gfx/gif2png/ChangeLog b/media-gfx/gif2png/ChangeLog
index 2c2cf596d07e..b2aea5861aaf 100644
--- a/media-gfx/gif2png/ChangeLog
+++ b/media-gfx/gif2png/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gif2png
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.29 2011/10/23 16:41:17 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.30 2012/02/03 07:32:21 radhermit Exp $
+
+*gif2png-2.5.5 (03 Feb 2012)
+
+  03 Feb 2012; Tim Harder <radhermit@gentoo.org> +gif2png-2.5.5.ebuild,
+  +files/gif2png-2.5.5-libpng15.patch:
+  Version bump.
 
   23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -gif2png-2.5.1.ebuild,
   -gif2png-2.5.1-r1.ebuild, -files/gif2png-2.5.1-libpng.patch:
diff --git a/media-gfx/gif2png/files/gif2png-2.5.5-libpng15.patch b/media-gfx/gif2png/files/gif2png-2.5.5-libpng15.patch
new file mode 100644
index 000000000000..ded68538ac4c
--- /dev/null
+++ b/media-gfx/gif2png/files/gif2png-2.5.5-libpng15.patch
@@ -0,0 +1,41 @@
+--- gif2png-2.5.5/gif2png.c.orig
++++ gif2png-2.5.5/gif2png.c
+@@ -12,6 +12,7 @@
+ #include <unistd.h>	/* for isatty() */
+ #include <sys/stat.h>
+ #include <utime.h>
++#include <zlib.h>
+ 
+ #if !defined(TRUE)
+ #define FALSE	0
+@@ -122,8 +123,8 @@
+     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;
+@@ -138,6 +139,19 @@
+     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.5.ebuild b/media-gfx/gif2png/gif2png-2.5.5.ebuild
new file mode 100644
index 000000000000..070cc8bf9ce9
--- /dev/null
+++ b/media-gfx/gif2png/gif2png-2.5.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.5.ebuild,v 1.1 2012/02/03 07:32:21 radhermit 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
+}