[arch-commits] Commit in gif2png/trunk (PKGBUILD gif2png-2.5.4-libpng15.patch)

Giovanni Scafora giovanni at archlinux.org
Thu Jan 19 11:45:38 UTC 2012


    Date: Thursday, January 19, 2012 @ 06:45:38
  Author: giovanni
Revision: 146932

upgpkg: gif2png 2.5.4-3

libpng 1.5 rebuild

Added:
  gif2png/trunk/gif2png-2.5.4-libpng15.patch
Modified:
  gif2png/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   10 ++++++---
 gif2png-2.5.4-libpng15.patch |   43 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-19 10:12:16 UTC (rev 146931)
+++ PKGBUILD	2012-01-19 11:45:38 UTC (rev 146932)
@@ -5,20 +5,24 @@
 
 pkgname=gif2png
 pkgver=2.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A GIF to PNG image format converter"
 arch=('i686' 'x86_64')
 url="http://www.catb.org/~esr/gif2png/"
 license=('ZLIB')
 depends=('libpng')
 optdepends=('python2: for using web2png')
-source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d63ea3fc6b6119589e8d4d6fead30df9')
+source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gif2png-2.5.4-libpng15.patch')
+md5sums=('d63ea3fc6b6119589e8d4d6fead30df9'
+         'd4d6d31e04e7448315eae56bb12d4df6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's#env python#env python2#' web2png
+  patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man
   make

Added: gif2png-2.5.4-libpng15.patch
===================================================================
--- gif2png-2.5.4-libpng15.patch	                        (rev 0)
+++ gif2png-2.5.4-libpng15.patch	2012-01-19 11:45:38 UTC (rev 146932)
@@ -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;




More information about the arch-commits mailing list