diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2010-11-11 20:19:16 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2010-11-11 20:19:16 (GMT) |
| commit | 67a8448f689c98cfee4058376d7f9eb614e2db05 (patch) | |
| tree | 9e7436d6e0603551539777f665df2e6b60a36308 /abs/extra/gd | |
| parent | 3d2398166dc2a96123d22af315e2f2073f6bb32f (diff) | |
| parent | 8014e8344b6f1a789a938fccc3b356a525ce8207 (diff) | |
| download | linhes_pkgbuild-67a8448f689c98cfee4058376d7f9eb614e2db05.zip linhes_pkgbuild-67a8448f689c98cfee4058376d7f9eb614e2db05.tar.gz linhes_pkgbuild-67a8448f689c98cfee4058376d7f9eb614e2db05.tar.bz2 | |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra/gd')
| -rw-r--r-- | abs/extra/gd/ChangeLog | 11 | ||||
| -rw-r--r-- | abs/extra/gd/PKGBUILD | 25 | ||||
| -rw-r--r-- | abs/extra/gd/libpng14.patch | 12 |
3 files changed, 37 insertions, 11 deletions
diff --git a/abs/extra/gd/ChangeLog b/abs/extra/gd/ChangeLog new file mode 100644 index 0000000..813a49e --- /dev/null +++ b/abs/extra/gd/ChangeLog @@ -0,0 +1,11 @@ +2010-01-17 Ionut Biru <ionut@archlinux.ro> + + * gd 2.0.36RC1-2 + * libpng 1.4.0/libjpeg 8 rebuild + +2009-10-30 Eric Belanger <eric@archlinux.org> + + * gd 2.0.36RC1-1 + * Upstream update + * Added perl depends + * Added ChangeLog diff --git a/abs/extra/gd/PKGBUILD b/abs/extra/gd/PKGBUILD index 3df77a1..4580855 100644 --- a/abs/extra/gd/PKGBUILD +++ b/abs/extra/gd/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 64437 2010-01-20 12:10:30Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=gd -pkgver=2.0.35 -pkgrel=2 +pkgver=2.0.36RC1 +pkgrel=3 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64') url="http://www.libgd.org/" license=('custom') -depends=('libpng>=1.2.16' 'fontconfig>=2.4.2' 'libjpeg') +depends=('perl' 'libpng>=1.4.0' 'fontconfig' 'libjpeg>=8') options=('!libtool') -source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6c6c3dbb7bf079e0bb5fbbfd3bb8a71c') -sha1sums=('ccf34a610abff2dbf133a20c4d2a4aa94939018a') +source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2 libpng14.patch) +md5sums=('e876979ca3130623a4e7866d9579171a' + '7921556f4960e8d66cf4fb67ea7101b5') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --without-xpm + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ${srcdir}/libpng14.patch || return 1 + + ./configure --prefix=/usr --without-xpm || return 1 make || return 1 - make DESTDIR=${startdir}/pkg install - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING + make DESTDIR="${pkgdir}" install || return 1 + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1 } diff --git a/abs/extra/gd/libpng14.patch b/abs/extra/gd/libpng14.patch new file mode 100644 index 0000000..19a3fda --- /dev/null +++ b/abs/extra/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 */ + } + |