[arch-commits] Commit in plotutils/repos (8 files)
Eric Bélanger
eric at archlinux.org
Fri Jan 27 01:31:15 UTC 2012
Date: Thursday, January 26, 2012 @ 20:31:15
Author: eric
Revision: 147686
archrelease: copy trunk to staging-x86_64, staging-i686
Added:
plotutils/repos/staging-i686/
plotutils/repos/staging-i686/PKGBUILD
(from rev 147685, plotutils/trunk/PKGBUILD)
plotutils/repos/staging-i686/plotutils-2.6-libpng-1.5.patch
(from rev 147685, plotutils/trunk/plotutils-2.6-libpng-1.5.patch)
plotutils/repos/staging-i686/plotutils.install
(from rev 147685, plotutils/trunk/plotutils.install)
plotutils/repos/staging-x86_64/
plotutils/repos/staging-x86_64/PKGBUILD
(from rev 147685, plotutils/trunk/PKGBUILD)
plotutils/repos/staging-x86_64/plotutils-2.6-libpng-1.5.patch
(from rev 147685, plotutils/trunk/plotutils-2.6-libpng-1.5.patch)
plotutils/repos/staging-x86_64/plotutils.install
(from rev 147685, plotutils/trunk/plotutils.install)
-----------------------------------------------+
staging-i686/PKGBUILD | 32 ++++++++++++++++++++++++
staging-i686/plotutils-2.6-libpng-1.5.patch | 31 +++++++++++++++++++++++
staging-i686/plotutils.install | 15 +++++++++++
staging-x86_64/PKGBUILD | 32 ++++++++++++++++++++++++
staging-x86_64/plotutils-2.6-libpng-1.5.patch | 31 +++++++++++++++++++++++
staging-x86_64/plotutils.install | 15 +++++++++++
6 files changed, 156 insertions(+)
Copied: plotutils/repos/staging-i686/PKGBUILD (from rev 147685, plotutils/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-27 01:31:15 UTC (rev 147686)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: damir <damir at archlinux.org>
+# Packager: Maksim Sipos (maxsipos at gmail dot com)
+
+pkgname=plotutils
+pkgver=2.6
+pkgrel=2
+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 plotutils-2.6-libpng-1.5.patch)
+sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
+ '426f6ee04186af5059ab54322efaf0a6a976682b')
+
+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 147685, 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 2012-01-27 01:31:15 UTC (rev 147686)
@@ -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
Copied: plotutils/repos/staging-i686/plotutils.install (from rev 147685, plotutils/trunk/plotutils.install)
===================================================================
--- staging-i686/plotutils.install (rev 0)
+++ staging-i686/plotutils.install 2012-01-27 01:31:15 UTC (rev 147686)
@@ -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 147685, plotutils/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-27 01:31:15 UTC (rev 147686)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: damir <damir at archlinux.org>
+# Packager: Maksim Sipos (maxsipos at gmail dot com)
+
+pkgname=plotutils
+pkgver=2.6
+pkgrel=2
+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 plotutils-2.6-libpng-1.5.patch)
+sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
+ '426f6ee04186af5059ab54322efaf0a6a976682b')
+
+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 147685, 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 2012-01-27 01:31:15 UTC (rev 147686)
@@ -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
Copied: plotutils/repos/staging-x86_64/plotutils.install (from rev 147685, plotutils/trunk/plotutils.install)
===================================================================
--- staging-x86_64/plotutils.install (rev 0)
+++ staging-x86_64/plotutils.install 2012-01-27 01:31:15 UTC (rev 147686)
@@ -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