Date: Sunday, February 5, 2012 @ 18:58:55 Author: giovanni Revision: 149144
upgpkg: gif2png 2.5.5-1 upstream release Added: gif2png/trunk/gif2png-2.5.5-libpng15.patch Modified: gif2png/trunk/PKGBUILD Deleted: gif2png/trunk/gif2png-2.5.4-libpng15.patch ------------------------------+ PKGBUILD | 12 +++++------ gif2png-2.5.4-libpng15.patch | 43 ----------------------------------------- gif2png-2.5.5-libpng15.patch | 41 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-02-05 21:51:45 UTC (rev 149143) +++ PKGBUILD 2012-02-05 23:58:55 UTC (rev 149144) @@ -4,8 +4,8 @@ # Contributor: Andrew Rose <o...@netrux.com> pkgname=gif2png -pkgver=2.5.4 -pkgrel=3 +pkgver=2.5.5 +pkgrel=1 pkgdesc="A GIF to PNG image format converter" arch=('i686' 'x86_64') url="http://www.catb.org/~esr/gif2png/" @@ -13,15 +13,15 @@ depends=('libpng') optdepends=('python2: for using web2png') source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gif2png-2.5.4-libpng15.patch') -md5sums=('d63ea3fc6b6119589e8d4d6fead30df9' - 'd4d6d31e04e7448315eae56bb12d4df6') + 'gif2png-2.5.5-libpng15.patch') +md5sums=('cfb4c003966866b6069d3707bfb12435' + '5b3467b97157f9a7978a230b934bc488') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#env python#env python2#' web2png - patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch + patch -Np1 -i ${srcdir}/gif2png-2.5.5-libpng15.patch ./configure --prefix=/usr \ --mandir=/usr/share/man Deleted: gif2png-2.5.4-libpng15.patch =================================================================== --- gif2png-2.5.4-libpng15.patch 2012-02-05 21:51:45 UTC (rev 149143) +++ gif2png-2.5.4-libpng15.patch 2012-02-05 23:58:55 UTC (rev 149144) @@ -1,43 +0,0 @@ -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; Added: gif2png-2.5.5-libpng15.patch =================================================================== --- gif2png-2.5.5-libpng15.patch (rev 0) +++ gif2png-2.5.5-libpng15.patch 2012-02-05 23:58:55 UTC (rev 149144) @@ -0,0 +1,41 @@ +--- a/gif2png.c 2012-01-29 00:02:06.000000000 +0100 ++++ b/gif2png.c 2012-02-06 00:49:14.000000000 +0100 +@@ -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;