Mercurial > mxe-octave
changeset 1620:7cc1f4c38523
package gd: libpng15 compatibility
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Fri, 04 Mar 2011 03:27:12 +1100 |
| parents | 4e295d6fc804 |
| children | 64fdb94ef9f2 |
| files | src/gd-1-libpng14.patch src/gd-1-libpng15.patch src/gd.mk |
| diffstat | 3 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gd-1-libpng14.patch Fri Mar 04 03:25:46 2011 +1100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# 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 */ - }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gd-1-libpng15.patch Fri Mar 04 03:27:12 2011 +1100 @@ -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 */ + }
--- a/src/gd.mk Fri Mar 04 03:25:46 2011 +1100 +++ b/src/gd.mk Fri Mar 04 03:27:12 2011 +1100 @@ -25,7 +25,7 @@ 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,png12,png14,g' '$(1)/configure' + $(SED) -i 's,png12,png15,g' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \