[arch-commits] Commit in gd/trunk (ChangeLog PKGBUILD libpng14.patch)

Ionut Biru ibiru at archlinux.org
Sun Jan 17 10:17:56 EST 2010


    Date: Sunday, January 17, 2010 @ 10:17:56
  Author: ibiru
Revision: 63462

upgpkg: gd 2.0.36RC1-2
    libjpeg8/libpng1.4.0 rebuild

Added:
  gd/trunk/libpng14.patch
Modified:
  gd/trunk/ChangeLog
  gd/trunk/PKGBUILD

----------------+
 ChangeLog      |    5 +++++
 PKGBUILD       |   13 ++++++++-----
 libpng14.patch |   12 ++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-01-17 15:16:18 UTC (rev 63461)
+++ ChangeLog	2010-01-17 15:17:56 UTC (rev 63462)
@@ -1,3 +1,8 @@
+2010-01-17  Ionut Biru <ionut at archlinux.ro>
+
+	* gd 2.0.36RC1-2
+	* libpng 1.4.0/libjpeg 8 rebuild
+
 2009-10-30  Eric Belanger  <eric at archlinux.org>
 
 	* gd 2.0.36RC1-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-17 15:16:18 UTC (rev 63461)
+++ PKGBUILD	2010-01-17 15:17:56 UTC (rev 63462)
@@ -3,19 +3,22 @@
 
 pkgname=gd
 pkgver=2.0.36RC1
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64')
 url="http://www.libgd.org/"
 license=('custom')
-depends=('perl' 'libpng' 'fontconfig' 'libjpeg')
+depends=('perl' 'libpng>=1.4.0' 'fontconfig' 'libjpeg>=8')
 options=('!libtool')
-source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e876979ca3130623a4e7866d9579171a')
-sha1sums=('415300e288348ed0d806fa2f3b7815604d8b5eec')
+source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2 libpng14.patch)
+md5sums=('e876979ca3130623a4e7866d9579171a'
+         '7cfb63cdffcc5374b2bef1db685a81ba')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+
   ./configure --prefix=/usr --without-xpm || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Added: libpng14.patch
===================================================================
--- libpng14.patch	                        (rev 0)
+++ libpng14.patch	2010-01-17 15:17:56 UTC (rev 63462)
@@ -0,0 +1,12 @@
+diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c
+--- gd-2.0.36RC1.orig/gd_png.c	2007-11-27 10:30:34.000000000 +0200
++++ gd-2.0.36RC1/gd_png.c	2010-01-17 17:14:11.000000000 +0200
+@@ -151,7 +151,7 @@
+ 	return NULL;
+   }
+ 
+-	if (!png_check_sig (sig, 8)) { /* bad signature */
++	if (!png_sig_cmp (sig, 0, 8)) { /* bad signature */
+     	return NULL;		/* bad signature */
+ 	}
+ 



More information about the arch-commits mailing list