diff options
| -rw-r--r-- | main/gd/APKBUILD | 25 | ||||
| -rw-r--r-- | main/gd/libpng14.patch | 12 |
2 files changed, 30 insertions, 7 deletions
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD index 75cd56cc48..96334d3c35 100644 --- a/main/gd/APKBUILD +++ b/main/gd/APKBUILD @@ -1,20 +1,26 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=gd -pkgver=2.0.35 -pkgrel=2 +pkgver=2.0.36_rc1 +_myver=2.0.36RC1 +pkgrel=0 pkgdesc="Library for the dynamic creation of images by programmers" url="http://www.libgd.org/" license="custom" depends= makedepends="libpng-dev jpeg-dev freetype-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2" +source="http://www.libgd.org/releases/${pkgname}-${_myver}.tar.bz2 + libpng14.patch" -build() { - cd "$srcdir/$pkgname-$pkgver" - find -name configure | xargs touch +_builddir="$srcdir"/$pkgname-$_myver +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/libpng14.patch +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -25,8 +31,13 @@ build() { --without-xpm \ --without-fontconfig make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="6c6c3dbb7bf079e0bb5fbbfd3bb8a71c gd-2.0.35.tar.bz2" +md5sums="e876979ca3130623a4e7866d9579171a gd-2.0.36RC1.tar.bz2 +7921556f4960e8d66cf4fb67ea7101b5 libpng14.patch" diff --git a/main/gd/libpng14.patch b/main/gd/libpng14.patch new file mode 100644 index 0000000000..19a3fda91f --- /dev/null +++ b/main/gd/libpng14.patch @@ -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 */ + } + |