[arch-commits] Commit in plotutils/repos (8 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Mon Apr 29 16:05:09 UTC 2013
Date: Monday, April 29, 2013 @ 18:05:09
Author: foutrelis
Revision: 183907
archrelease: copy trunk to staging-x86_64, staging-i686
Added:
plotutils/repos/staging-i686/
plotutils/repos/staging-i686/PKGBUILD
(from rev 183906, plotutils/trunk/PKGBUILD)
plotutils/repos/staging-i686/plotutils-2.6-libpng-1.5.patch
(from rev 183906, plotutils/trunk/plotutils-2.6-libpng-1.5.patch)
plotutils/repos/staging-i686/plotutils.install
(from rev 183906, plotutils/trunk/plotutils.install)
plotutils/repos/staging-x86_64/
plotutils/repos/staging-x86_64/PKGBUILD
(from rev 183906, plotutils/trunk/PKGBUILD)
plotutils/repos/staging-x86_64/plotutils-2.6-libpng-1.5.patch
(from rev 183906, plotutils/trunk/plotutils-2.6-libpng-1.5.patch)
plotutils/repos/staging-x86_64/plotutils.install
(from rev 183906, plotutils/trunk/plotutils.install)
-----------------------------------------------+
staging-i686/PKGBUILD | 34 ++++++++++++++++++++++++
staging-i686/plotutils-2.6-libpng-1.5.patch | 31 +++++++++++++++++++++
staging-i686/plotutils.install | 15 ++++++++++
staging-x86_64/PKGBUILD | 34 ++++++++++++++++++++++++
staging-x86_64/plotutils-2.6-libpng-1.5.patch | 31 +++++++++++++++++++++
staging-x86_64/plotutils.install | 15 ++++++++++
6 files changed, 160 insertions(+)
Copied: plotutils/repos/staging-i686/PKGBUILD (from rev 183906, plotutils/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-04-29 16:05:09 UTC (rev 183907)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: damir <damir at archlinux.org>
+# Packager: Maksim Sipos (maxsipos at gmail dot com)
+
+pkgname=plotutils
+pkgver=2.6
+pkgrel=4
+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")
+options=('!libtool')
+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')
+
+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/staging-i686/plotutils-2.6-libpng-1.5.patch (from rev 183906, plotutils/trunk/plotutils-2.6-libpng-1.5.patch)
===================================================================
--- staging-i686/plotutils-2.6-libpng-1.5.patch (rev 0)
+++ staging-i686/plotutils-2.6-libpng-1.5.patch 2013-04-29 16:05:09 UTC (rev 183907)
@@ -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
Copied: plotutils/repos/staging-i686/plotutils.install (from rev 183906, plotutils/trunk/plotutils.install)
===================================================================
--- staging-i686/plotutils.install (rev 0)
+++ staging-i686/plotutils.install 2013-04-29 16:05:09 UTC (rev 183907)
@@ -0,0 +1,15 @@
+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
+}
Copied: plotutils/repos/staging-x86_64/PKGBUILD (from rev 183906, plotutils/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-04-29 16:05:09 UTC (rev 183907)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: damir <damir at archlinux.org>
+# Packager: Maksim Sipos (maxsipos at gmail dot com)
+
+pkgname=plotutils
+pkgver=2.6
+pkgrel=4
+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")
+options=('!libtool')
+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')
+
+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/staging-x86_64/plotutils-2.6-libpng-1.5.patch (from rev 183906, plotutils/trunk/plotutils-2.6-libpng-1.5.patch)
===================================================================
--- staging-x86_64/plotutils-2.6-libpng-1.5.patch (rev 0)
+++ staging-x86_64/plotutils-2.6-libpng-1.5.patch 2013-04-29 16:05:09 UTC (rev 183907)
@@ -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
Copied: plotutils/repos/staging-x86_64/plotutils.install (from rev 183906, plotutils/trunk/plotutils.install)
===================================================================
--- staging-x86_64/plotutils.install (rev 0)
+++ staging-x86_64/plotutils.install 2013-04-29 16:05:09 UTC (rev 183907)
@@ -0,0 +1,15 @@
+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
+}
More information about the arch-commits
mailing list