diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 17:51:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 17:51:32 -0300 |
| commit | 8878de8508ef59fe63f2d19a258a383ba09b10a8 (patch) | |
| tree | 9c5bf862464d4d4c2dae393189065a2615fa260e /extra/gd | |
| parent | 0fccb862cc0ea09fc8a76c29babfdcef823d9ab7 (diff) | |
| parent | 0d51c533d75a26daabeb9e7b9c5dcfb211498a4d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libfm/PKGBUILD
community/lxlauncher/PKGBUILD
community/mrtg/PKGBUILD
core/glib2/PKGBUILD
extra/epiphany/PKGBUILD
extra/m17n-lib/PKGBUILD
extra/mtr/PKGBUILD
Diffstat (limited to 'extra/gd')
| -rw-r--r-- | extra/gd/PKGBUILD | 23 | ||||
| -rw-r--r-- | extra/gd/libpng14.patch | 12 |
2 files changed, 12 insertions, 23 deletions
diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD index 004201ad0..b4c267986 100644 --- a/extra/gd/PKGBUILD +++ b/extra/gd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184379 2013-05-06 19:37:20Z foutrelis $ +# $Id: PKGBUILD 189861 2013-07-10 07:26:52Z bpiotrowski $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=gd -pkgver=2.0.36RC1 -pkgrel=6 +pkgver=2.1.0 +pkgrel=1 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64' 'mips64el') url="http://www.libgd.org/" @@ -11,21 +11,22 @@ license=('custom') depends=('libpng' 'fontconfig' 'libjpeg') optdepends=('perl: bdftogd script') options=('!libtool') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'libpng14.patch') -md5sums=('e876979ca3130623a4e7866d9579171a' - '7921556f4960e8d66cf4fb67ea7101b5') +source=(https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${pkgver}.tar.xz) +md5sums=('03588159bf4faab9079849c8d709acc6') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ${srcdir}/libpng14.patch + cd libgd-${pkgver} ./configure --prefix=/usr --without-xpm make } +check() { + cd libgd-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd libgd-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/gd/libpng14.patch b/extra/gd/libpng14.patch deleted file mode 100644 index 19a3fda91..000000000 --- a/extra/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 */ - } - |