Date: Saturday, May 14, 2016 @ 21:30:44 Author: arojas Revision: 268012
archrelease: copy trunk to extra-x86_64, extra-i686 Added: plotutils/repos/extra-i686/PKGBUILD (from rev 268011, plotutils/trunk/PKGBUILD) plotutils/repos/extra-i686/plotutils-2.6-libpng-1.5.patch (from rev 268011, plotutils/trunk/plotutils-2.6-libpng-1.5.patch) plotutils/repos/extra-x86_64/PKGBUILD (from rev 268011, plotutils/trunk/PKGBUILD) plotutils/repos/extra-x86_64/plotutils-2.6-libpng-1.5.patch (from rev 268011, plotutils/trunk/plotutils-2.6-libpng-1.5.patch) Deleted: plotutils/repos/extra-i686/PKGBUILD plotutils/repos/extra-i686/plotutils-2.6-libpng-1.5.patch plotutils/repos/extra-i686/plotutils.install plotutils/repos/extra-x86_64/PKGBUILD plotutils/repos/extra-x86_64/plotutils-2.6-libpng-1.5.patch plotutils/repos/extra-x86_64/plotutils.install ---------------------------------------------+ /PKGBUILD | 66 ++++++++++++++++++++++++++ /plotutils-2.6-libpng-1.5.patch | 62 ++++++++++++++++++++++++ extra-i686/PKGBUILD | 34 ------------- extra-i686/plotutils-2.6-libpng-1.5.patch | 31 ------------ extra-i686/plotutils.install | 15 ----- extra-x86_64/PKGBUILD | 34 ------------- extra-x86_64/plotutils-2.6-libpng-1.5.patch | 31 ------------ extra-x86_64/plotutils.install | 15 ----- 8 files changed, 128 insertions(+), 160 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-05-14 19:30:13 UTC (rev 268011) +++ extra-i686/PKGBUILD 2016-05-14 19:30:44 UTC (rev 268012) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: damir <da...@archlinux.org> -# Packager: Maksim Sipos (maxsipos at gmail dot com) - -pkgname=plotutils -pkgver=2.6 -pkgrel=7 -arch=('x86_64' 'i686') -pkgdesc="Set of utilities and libraries for plotting." -url="http://directory.fsf.org/graphics/plotutils.html" -license=("GPL") -depends=("libpng" "gcc-libs" "libxaw>=1.0.5") -install=plotutils.install -source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig} - plotutils-2.6-libpng-1.5.patch) -sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838' - 'ab78e2d06402aaac367da7a0e5810439d5b9853f' - '492f0e04f8265ab50d9ba0905a0f5adf3ec06ab8') -validpgpkeys=('C7823604DFEA27BC29DD4F179DEB46C0D679F6CF') # Karl Berry - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../plotutils-2.6-libpng-1.5.patch - ./configure --prefix=/usr \ - --with-gnu-ld \ - --with-x \ - --enable-libplotter - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: plotutils/repos/extra-i686/PKGBUILD (from rev 268011, plotutils/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-05-14 19:30:44 UTC (rev 268012) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: damir <da...@archlinux.org> +# Packager: Maksim Sipos (maxsipos at gmail dot com) + +pkgname=plotutils +pkgver=2.6 +pkgrel=8 +arch=('x86_64' 'i686') +pkgdesc="Set of utilities and libraries for plotting." +url="http://directory.fsf.org/graphics/plotutils.html" +license=("GPL") +depends=("libpng" "gcc-libs" "libxaw>=1.0.5") +source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig} + plotutils-2.6-libpng-1.5.patch) +sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838' + 'ab78e2d06402aaac367da7a0e5810439d5b9853f' + '492f0e04f8265ab50d9ba0905a0f5adf3ec06ab8') +validpgpkeys=('C7823604DFEA27BC29DD4F179DEB46C0D679F6CF') # Karl Berry + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../plotutils-2.6-libpng-1.5.patch + ./configure --prefix=/usr \ + --with-gnu-ld \ + --with-x \ + --enable-libplotter + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/plotutils-2.6-libpng-1.5.patch =================================================================== --- extra-i686/plotutils-2.6-libpng-1.5.patch 2016-05-14 19:30:13 UTC (rev 268011) +++ extra-i686/plotutils-2.6-libpng-1.5.patch 2016-05-14 19:30:44 UTC (rev 268012) @@ -1,31 +0,0 @@ -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 (setjmp (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); -+ png_longjmp (png_ptr, 1); - } - - static void -@@ -515,7 +515,7 @@ - #endif - } - -- longjmp (png_ptr->jmpbuf, 1); -+ png_longjmp (png_ptr, 1); - } - - static void Copied: plotutils/repos/extra-i686/plotutils-2.6-libpng-1.5.patch (from rev 268011, plotutils/trunk/plotutils-2.6-libpng-1.5.patch) =================================================================== --- extra-i686/plotutils-2.6-libpng-1.5.patch (rev 0) +++ extra-i686/plotutils-2.6-libpng-1.5.patch 2016-05-14 19:30:44 UTC (rev 268012) @@ -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 (setjmp (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); ++ png_longjmp (png_ptr, 1); + } + + static void +@@ -515,7 +515,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ png_longjmp (png_ptr, 1); + } + + static void Deleted: extra-i686/plotutils.install =================================================================== --- extra-i686/plotutils.install 2016-05-14 19:30:13 UTC (rev 268011) +++ extra-i686/plotutils.install 2016-05-14 19:30:44 UTC (rev 268012) @@ -1,15 +0,0 @@ -infodir=usr/share/info - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null -} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-05-14 19:30:13 UTC (rev 268011) +++ extra-x86_64/PKGBUILD 2016-05-14 19:30:44 UTC (rev 268012) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: damir <da...@archlinux.org> -# Packager: Maksim Sipos (maxsipos at gmail dot com) - -pkgname=plotutils -pkgver=2.6 -pkgrel=7 -arch=('x86_64' 'i686') -pkgdesc="Set of utilities and libraries for plotting." -url="http://directory.fsf.org/graphics/plotutils.html" -license=("GPL") -depends=("libpng" "gcc-libs" "libxaw>=1.0.5") -install=plotutils.install -source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig} - plotutils-2.6-libpng-1.5.patch) -sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838' - 'ab78e2d06402aaac367da7a0e5810439d5b9853f' - '492f0e04f8265ab50d9ba0905a0f5adf3ec06ab8') -validpgpkeys=('C7823604DFEA27BC29DD4F179DEB46C0D679F6CF') # Karl Berry - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../plotutils-2.6-libpng-1.5.patch - ./configure --prefix=/usr \ - --with-gnu-ld \ - --with-x \ - --enable-libplotter - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: plotutils/repos/extra-x86_64/PKGBUILD (from rev 268011, plotutils/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-05-14 19:30:44 UTC (rev 268012) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: damir <da...@archlinux.org> +# Packager: Maksim Sipos (maxsipos at gmail dot com) + +pkgname=plotutils +pkgver=2.6 +pkgrel=8 +arch=('x86_64' 'i686') +pkgdesc="Set of utilities and libraries for plotting." +url="http://directory.fsf.org/graphics/plotutils.html" +license=("GPL") +depends=("libpng" "gcc-libs" "libxaw>=1.0.5") +source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig} + plotutils-2.6-libpng-1.5.patch) +sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838' + 'ab78e2d06402aaac367da7a0e5810439d5b9853f' + '492f0e04f8265ab50d9ba0905a0f5adf3ec06ab8') +validpgpkeys=('C7823604DFEA27BC29DD4F179DEB46C0D679F6CF') # Karl Berry + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../plotutils-2.6-libpng-1.5.patch + ./configure --prefix=/usr \ + --with-gnu-ld \ + --with-x \ + --enable-libplotter + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/plotutils-2.6-libpng-1.5.patch =================================================================== --- extra-x86_64/plotutils-2.6-libpng-1.5.patch 2016-05-14 19:30:13 UTC (rev 268011) +++ extra-x86_64/plotutils-2.6-libpng-1.5.patch 2016-05-14 19:30:44 UTC (rev 268012) @@ -1,31 +0,0 @@ -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 (setjmp (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); -+ png_longjmp (png_ptr, 1); - } - - static void -@@ -515,7 +515,7 @@ - #endif - } - -- longjmp (png_ptr->jmpbuf, 1); -+ png_longjmp (png_ptr, 1); - } - - static void Copied: plotutils/repos/extra-x86_64/plotutils-2.6-libpng-1.5.patch (from rev 268011, plotutils/trunk/plotutils-2.6-libpng-1.5.patch) =================================================================== --- extra-x86_64/plotutils-2.6-libpng-1.5.patch (rev 0) +++ extra-x86_64/plotutils-2.6-libpng-1.5.patch 2016-05-14 19:30:44 UTC (rev 268012) @@ -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 (setjmp (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); ++ png_longjmp (png_ptr, 1); + } + + static void +@@ -515,7 +515,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ png_longjmp (png_ptr, 1); + } + + static void Deleted: extra-x86_64/plotutils.install =================================================================== --- extra-x86_64/plotutils.install 2016-05-14 19:30:13 UTC (rev 268011) +++ extra-x86_64/plotutils.install 2016-05-14 19:30:44 UTC (rev 268012) @@ -1,15 +0,0 @@ -infodir=usr/share/info - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null -}