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

[Giovanni Scafora]

    Date: Wednesday, February 10, 2010 @ 05:51:18
  Author: giovanni
Revision: 67991

Merged revisions 67990 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gif2png/trunk

........
  r67990 | giovanni | 2010-02-10 11:50:37 +0100 (mer, 10 feb 2010) | 2 lines
  
  upgpkg: gif2png 2.5.2-1
      upstream release
........

Modified:
  gif2png/repos/extra-i686/	(properties)
  gif2png/repos/extra-i686/PKGBUILD
Deleted:
  gif2png/repos/extra-i686/gif2png-2.5.1-libpng.patch

----------------------------+
 PKGBUILD                   |   21 ++++++++++-----------
 gif2png-2.5.1-libpng.patch |   30 ------------------------------
 2 files changed, 10 insertions(+), 41 deletions(-)


Property changes on: gif2png/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gif2png/trunk:1-63894
   + /gif2png/trunk:1-67990

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-10 10:50:37 UTC (rev 67990)
+++ extra-i686/PKGBUILD	2010-02-10 10:51:18 UTC (rev 67991)
@@ -4,24 +4,23 @@
 # Contributor: Andrew Rose <ody at netrux.com>
 
 pkgname=gif2png
-pkgver=2.5.1
-pkgrel=3
+pkgver=2.5.2
+pkgrel=1
 pkgdesc="A GIF to PNG image format converter"
 arch=('i686' 'x86_64')
 url="http://www.catb.org/~esr/gif2png/"
 license=('ZLIB')
 depends=('libpng>=1.4.0')
 optdepends=('python: for using web2png')
-source=(http://www.catb.org/~esr/$pkgname/$pkgname-$pkgver.tar.gz
-	gif2png-2.5.1-libpng.patch)
-md5sums=('85bb8ee345fc41c218de19dda0164806'
-	'0febd590ff529fbbb8be040b057349b2')
+source=(http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('2200841f027c8481c4b8519dabf745b0')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p2 < ../gif2png-2.5.1-libpng.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man || return 1
   make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" || return 1
 }

Deleted: extra-i686/gif2png-2.5.1-libpng.patch
===================================================================
--- extra-i686/gif2png-2.5.1-libpng.patch	2010-02-10 10:50:37 UTC (rev 67990)
+++ extra-i686/gif2png-2.5.1-libpng.patch	2010-02-10 10:51:18 UTC (rev 67991)
@@ -1,30 +0,0 @@
---- work/gif2png-2.5.1/gif2png.c.orig	2006-07-07 16:40:33.000000000 -0400
-+++ work/gif2png-2.5.1/gif2png.c	2006-07-07 16:43:25.000000000 -0400
-@@ -135,7 +135,7 @@
-     unsigned long hist_maxvalue;
-     int passcount;
-     int errtype, errorcount = 0;
--    png_text software;
-+    png_text comment, software;
- 
-     /* these volatile declarations prevent gcc warnings ("variable might be
-      *  clobbered by `longjmp' or `vfork'") */
-@@ -517,10 +517,15 @@
- 	    j = s->size;
- 	    if (j > 0 && data[j-1] == '\0')  /* some apps include a NULL in GIF comment */
- 		--j;
--	    if (j<500) {
--		png_write_tEXt(png_ptr, "Comment", (png_charp)data, j);
-+      if (j<1000) {
-+        comment.compression = PNG_TEXT_COMPRESSION_NONE;
- 	    } else {
--		png_write_zTXt(png_ptr, "Comment", (png_charp)data, j, 0);
-+        comment.compression = PNG_TEXT_COMPRESSION_zTXt;
-+        comment.key = "Comment";
-+        comment.text = data;
-+        comment.text_length = j;
-+
-+        png_set_text(png_ptr, info_ptr, &comment, 1);
- 	    }
- 	    break;
-