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

[Giovanni Scafora]

    Date: Thursday, March 8, 2012 @ 07:06:31
  Author: giovanni
Revision: 152668

upgpkg: gif2png 2.5.6-1

upstream release

Modified:
  gif2png/trunk/PKGBUILD
Deleted:
  gif2png/trunk/gif2png-2.5.5-libpng15.patch

------------------------------+
 PKGBUILD                     |    9 +++------
 gif2png-2.5.5-libpng15.patch |   41 -----------------------------------------
 2 files changed, 3 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2012-03-08 10:18:12 UTC (rev 152667)
+++ PKGBUILD    2012-03-08 12:06:31 UTC (rev 152668)
@@ -4,7 +4,7 @@
 # Contributor: Andrew Rose <o...@netrux.com>
 
 pkgname=gif2png
-pkgver=2.5.5
+pkgver=2.5.6
 pkgrel=1
 pkgdesc="A GIF to PNG image format converter"
 arch=('i686' 'x86_64')
@@ -12,16 +12,13 @@
 license=('ZLIB')
 depends=('libpng')
 optdepends=('python2: for using web2png')
-source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-        'gif2png-2.5.5-libpng15.patch')
-md5sums=('cfb4c003966866b6069d3707bfb12435'
-         '5b3467b97157f9a7978a230b934bc488')
+source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz";)
+md5sums=('47f74725311f9293e8a8d8c44ddc08c9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's#env python#env python2#' web2png
-  patch -Np1 -i ${srcdir}/gif2png-2.5.5-libpng15.patch
 
   ./configure --prefix=/usr \
               --mandir=/usr/share/man

Deleted: gif2png-2.5.5-libpng15.patch
===================================================================
--- gif2png-2.5.5-libpng15.patch        2012-03-08 10:18:12 UTC (rev 152667)
+++ gif2png-2.5.5-libpng15.patch        2012-03-08 12:06:31 UTC (rev 152668)
@@ -1,41 +0,0 @@
---- 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;