# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1279285773 -7200
# Node ID 34f5daca82f4a59288f9efff0324c693894dcbe1
# Parent  5602f49af84e0ca8460ccb6abce8293131dbcabd
bugfix: support libpng-1.4 in package gd  (by Tony Theodore)

diff -r 5602f49af84e -r 34f5daca82f4 src/gd-1-libpng14.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gd-1-libpng14.patch	Fri Jul 16 15:09:33 2010 +0200
@@ -0,0 +1,17 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+This patch has been taken from:
+http://bugs.gentoo.org/show_bug.cgi?id=305101
+http://repos.archlinux.org/wsvn/packages/gd/trunk/libpng14.patch
+
+--- a/gd_png.c
++++ b/gd_png.c
+@@ -149,7 +149,7 @@
+ 	return NULL;
+   }
+ 
+-	if (!png_check_sig (sig, 8)) { /* bad signature */
++	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
+     	return NULL;		/* bad signature */
+ 	}
diff -r 5602f49af84e -r 34f5daca82f4 src/gd.mk
--- a/src/gd.mk	Fri Jul 16 13:23:37 2010 +0200
+++ b/src/gd.mk	Fri Jul 16 15:09:33 2010 +0200
@@ -24,14 +24,14 @@
     touch '$(1)/config.hin'
     touch '$(1)/Makefile.in'
     $(SED) -i 's,-I@includedir@,-I@includedir@ -DNONDLL,' '$(1)/config/gdlib-config.in'
-    $(SED) -i 's,-lX11 ,,g' '$(1)/configure'
+    $(SED) -i 's,-lX11 ,,g'     '$(1)/configure'
+    $(SED) -i 's,png12,png14,g' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-freetype='$(PREFIX)/$(TARGET)' \
         --without-x \
-        LIBPNG12_CONFIG='$(PREFIX)/$(TARGET)/bin/libpng12-config' \
         LIBPNG_CONFIG='$(PREFIX)/$(TARGET)/bin/libpng-config' \
         CFLAGS='-DNONDLL -DXMD_H -L$(PREFIX)/$(TARGET)/lib' \
         LIBS="`$(PREFIX)/$(TARGET)/bin/xml2-config --libs`"