summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-01-19 13:44:14 +0100
committersibel <lesibel@free.fr>2011-01-19 13:44:14 +0100
commit7d7df0e3ff53dd9f2bd7eef37facbe7850540412 (patch)
tree1f18f543bd9359b2cab79078c5279858b0f0ae30
parent1f5af446ae10d20264abaebdb606d30d391b9323 (diff)
downloadnutyx-extra-7d7df0e3ff53dd9f2bd7eef37facbe7850540412.tar.gz
nutyx-extra-7d7df0e3ff53dd9f2bd7eef37facbe7850540412.tar.bz2
nutyx-extra-7d7df0e3ff53dd9f2bd7eef37facbe7850540412.tar.xz
nutyx-extra-7d7df0e3ff53dd9f2bd7eef37facbe7850540412.zip
gd, correction port
-rw-r--r--extra/gd/.md5sum2
-rw-r--r--extra/gd/Pkgfile4
-rw-r--r--extra/gd/gd-2.0.35-libpng14.patch12
-rw-r--r--test/akode/.footprint (renamed from extra/akode/.footprint)0
-rw-r--r--test/akode/.md5sum (renamed from extra/akode/.md5sum)0
-rw-r--r--test/akode/Pkgfile (renamed from extra/akode/Pkgfile)0
6 files changed, 15 insertions, 3 deletions
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 */
+ }
+
diff --git a/extra/akode/.footprint b/test/akode/.footprint
index 0caf1808a..0caf1808a 100644
--- a/extra/akode/.footprint
+++ b/test/akode/.footprint
diff --git a/extra/akode/.md5sum b/test/akode/.md5sum
index 12fddaff2..12fddaff2 100644
--- a/extra/akode/.md5sum
+++ b/test/akode/.md5sum
diff --git a/extra/akode/Pkgfile b/test/akode/Pkgfile
index ac3d90ba5..ac3d90ba5 100644
--- a/extra/akode/Pkgfile
+++ b/test/akode/Pkgfile