[arch-commits] Commit in gif2png/repos (4 files)

Ionut Biru ibiru at archlinux.org
Sun Feb 5 06:48:33 EST 2012


    Date: Sunday, February 5, 2012 @ 06:48:32
  Author: ibiru
Revision: 148732

db-move: moved gif2png from [testing] to [extra] (x86_64)

Added:
  gif2png/repos/extra-x86_64/PKGBUILD
    (from rev 148654, gif2png/repos/testing-x86_64/PKGBUILD)
  gif2png/repos/extra-x86_64/gif2png-2.5.4-libpng15.patch
    (from rev 148654, gif2png/repos/testing-x86_64/gif2png-2.5.4-libpng15.patch)
Deleted:
  gif2png/repos/extra-x86_64/PKGBUILD
  gif2png/repos/testing-x86_64/

------------------------------+
 PKGBUILD                     |   68 +++++++++++++++++++++--------------------
 gif2png-2.5.4-libpng15.patch |   43 +++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 32 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-05 11:48:30 UTC (rev 148731)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:48:32 UTC (rev 148732)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: eric <eric at archlinux.org>
-# Contributor: Andrew Rose <ody at netrux.com>
-
-pkgname=gif2png
-pkgver=2.5.4
-pkgrel=2
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's#env python#env python2#' web2png
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: gif2png/repos/extra-x86_64/PKGBUILD (from rev 148654, gif2png/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:48:32 UTC (rev 148732)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: eric <eric at archlinux.org>
+# Contributor: Andrew Rose <ody at netrux.com>
+
+pkgname=gif2png
+pkgver=2.5.4
+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"
+        '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
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: gif2png/repos/extra-x86_64/gif2png-2.5.4-libpng15.patch (from rev 148654, gif2png/repos/testing-x86_64/gif2png-2.5.4-libpng15.patch)
===================================================================
--- extra-x86_64/gif2png-2.5.4-libpng15.patch	                        (rev 0)
+++ extra-x86_64/gif2png-2.5.4-libpng15.patch	2012-02-05 11:48:32 UTC (rev 148732)
@@ -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