From 7d7df0e3ff53dd9f2bd7eef37facbe7850540412 Mon Sep 17 00:00:00 2001
From: sibel <lesibel@free.fr>
Date: Wed, 19 Jan 2011 13:44:14 +0100
Subject: gd, correction port

---
 extra/gd/.md5sum                  |  2 +-
 extra/gd/Pkgfile                  |  4 ++--
 extra/gd/gd-2.0.35-libpng14.patch | 12 ++++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 extra/gd/gd-2.0.35-libpng14.patch

(limited to 'extra/gd')

diff --git a/extra/gd/.md5sum b/extra/gd/.md5sum
index efaeaf992..81e2348b1 100644
--- a/extra/gd/.md5sum
+++ b/extra/gd/.md5sum
@@ -1,2 +1,2 @@
+ac7bd291a83cffe8d5c3662d23fac185  gd-2.0.35-libpng14.patch
 982963448dc36f20cb79b6e9ba6fdede  gd-2.0.35.tar.gz
-7921556f4960e8d66cf4fb67ea7101b5  libpng14.patch
diff --git a/extra/gd/Pkgfile b/extra/gd/Pkgfile
index 64cba6597..3bde0826a 100644
--- a/extra/gd/Pkgfile
+++ b/extra/gd/Pkgfile
@@ -9,11 +9,11 @@ name=gd
 version=2.0.35
 release=1
 source=(http://www.libgd.org/releases/$name-$version.tar.gz\
-	http://nutyx.meticul.eu/files/patchs/$name/libpng14.patch)
+	gd-2.0.35-libpng14.patch)
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../libpng14.patch
+	patch -Np1 -i ../gd-2.0.35-libpng14.patch
 	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
diff --git a/extra/gd/gd-2.0.35-libpng14.patch b/extra/gd/gd-2.0.35-libpng14.patch
new file mode 100644
index 000000000..da5b4fb00
--- /dev/null
+++ b/extra/gd/gd-2.0.35-libpng14.patch
@@ -0,0 +1,12 @@
+diff -Nur gd-2.0.35.orig/gd_png.c gd-2.0.35/gd_png.c
+--- gd-2.0.35.orig/gd_png.c	2007-11-27 10:30:34.000000000 +0200
++++ gd-2.0.35/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 */
+ 	}
+ 
-- 
cgit v1.2.3-70-g09d2