diff options
author | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
commit | 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch) | |
tree | 8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /extra/plotutils | |
parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) |
Mon Feb 6 23:14:50 UTC 2012
Diffstat (limited to 'extra/plotutils')
-rw-r--r-- | extra/plotutils/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/plotutils/plotutils-2.6-libpng-1.5.patch | 31 | ||||
-rw-r--r-- | extra/plotutils/plotutils.install | 8 |
3 files changed, 50 insertions, 12 deletions
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD index cd8d4f347..91e2c7775 100644 --- a/extra/plotutils/PKGBUILD +++ b/extra/plotutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64564 2010-01-21 06:02:58Z eric $ +# $Id: PKGBUILD 148880 2012-02-05 11:53:57Z ibiru $ # Maintainer: damir <damir@archlinux.org> # Packager: Maksim Sipos (maxsipos at gmail dot com) pkgname=plotutils pkgver=2.6 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') pkgdesc="Set of utilities and libraries for plotting." url="http://directory.fsf.org/graphics/plotutils.html" @@ -12,16 +12,21 @@ license=("GPL") depends=("libpng" "gcc-libs" "libxaw>=1.0.5") options=('!libtool') install=plotutils.install -source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz) -md5sums=('c08a424bd2438c80a786a7f4b5bb6a40') -sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838') +source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch) +sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838' + '426f6ee04186af5059ab54322efaf0a6a976682b') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../plotutils-2.6-libpng-1.5.patch ./configure --prefix=/usr \ --with-gnu-ld \ --with-x \ - --enable-libplotter || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --enable-libplotter + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/plotutils/plotutils-2.6-libpng-1.5.patch b/extra/plotutils/plotutils-2.6-libpng-1.5.patch new file mode 100644 index 000000000..b86d9f457 --- /dev/null +++ b/extra/plotutils/plotutils-2.6-libpng-1.5.patch @@ -0,0 +1,31 @@ +fix building with libpng-1.5 + +--- libplot/z_write.c ++++ libplot/z_write.c +@@ -164,7 +164,7 @@ + } + + /* cleanup after libpng errors (error handler does a longjmp) */ +- if (setjmp (png_ptr->jmpbuf)) ++ if (png_jmpbuf (png_ptr)) + { + png_destroy_write_struct (&png_ptr, (png_info **)NULL); + return -1; +@@ -444,7 +444,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_ptr), 1); + } + + static void +@@ -515,7 +515,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_ptr), 1); + } + + static void diff --git a/extra/plotutils/plotutils.install b/extra/plotutils/plotutils.install index dd3ffb74f..d3d033e0c 100644 --- a/extra/plotutils/plotutils.install +++ b/extra/plotutils/plotutils.install @@ -1,7 +1,8 @@ -infodir=/usr/share/info +infodir=usr/share/info post_install() { - install-info $infodir/plotutils.info $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null } post_upgrade() { @@ -9,5 +10,6 @@ post_upgrade() { } pre_remove() { - install-info --delete $infodir/plotutils.info $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null } |