diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2011-05-14 10:39:34 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2011-05-14 10:39:34 +0000 |
| commit | 5246e0fe3669677b8104f66d151319a36d0150bf (patch) | |
| tree | 12fc4ec8abc5b7a3fb2438e43febd626f8f869b4 /main/gd | |
| parent | e3ac0c28b40b80df804092e7378dc67ec00df4fd (diff) | |
| download | aports-5246e0fe3669677b8104f66d151319a36d0150bf.tar.bz2 aports-5246e0fe3669677b8104f66d151319a36d0150bf.tar.xz | |
main/gd: rebuild against libpng 1.5
Diffstat (limited to 'main/gd')
| -rw-r--r-- | main/gd/APKBUILD | 11 | ||||
| -rw-r--r-- | main/gd/libpng14.patch | 12 |
2 files changed, 7 insertions, 16 deletions
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD index 5dd4866047..e028200742 100644 --- a/main/gd/APKBUILD +++ b/main/gd/APKBUILD @@ -3,7 +3,7 @@ pkgname=gd pkgver=2.0.36_rc1 _myver=2.0.36RC1 -pkgrel=6 +pkgrel=7 pkgdesc="Library for the dynamic creation of images by programmers" url="http://www.libgd.org/" arch="all" @@ -11,13 +11,11 @@ license="custom" depends= makedepends="libpng-dev jpeg-dev freetype-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.libgd.org/releases/${pkgname}-${_myver}.tar.bz2 - libpng14.patch" +source="http://www.libgd.org/releases/${pkgname}-${_myver}.tar.bz2" _builddir="$srcdir"/$pkgname-$_myver prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/libpng14.patch } build() { @@ -40,5 +38,10 @@ package() { install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } +dev() { + default_dev + rm -r "$subpkgdir"/usr/lib/libgd.la +} + md5sums="e876979ca3130623a4e7866d9579171a gd-2.0.36RC1.tar.bz2 7921556f4960e8d66cf4fb67ea7101b5 libpng14.patch" diff --git a/main/gd/libpng14.patch b/main/gd/libpng14.patch deleted file mode 100644 index 19a3fda91f..0000000000 --- a/main/gd/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 */ - } - |