[arch-commits] Commit in plotutils/repos (6 files)

[Ionut Biru]

    Date: Sunday, February 5, 2012 @ 06:53:57
  Author: ibiru
Revision: 148880

db-move: moved plotutils from [testing] to [extra] (x86_64)

Added:
  plotutils/repos/extra-x86_64/PKGBUILD
    (from rev 148654, plotutils/repos/testing-x86_64/PKGBUILD)
  plotutils/repos/extra-x86_64/plotutils-2.6-libpng-1.5.patch
    (from rev 148654, plotutils/repos/testing-x86_64/plotutils-2.6-libpng-1.5.patch)
  plotutils/repos/extra-x86_64/plotutils.install
    (from rev 148654, plotutils/repos/testing-x86_64/plotutils.install)
Deleted:
  plotutils/repos/extra-x86_64/PKGBUILD
  plotutils/repos/extra-x86_64/plotutils.install
  plotutils/repos/testing-x86_64/

--------------------------------+
 PKGBUILD                       |   59 +++++++++++++++++++++------------------
 plotutils-2.6-libpng-1.5.patch |   31 ++++++++++++++++++++
 plotutils.install              |   28 +++++++++---------
 3 files changed, 78 insertions(+), 40 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-05 11:53:53 UTC (rev 148879)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:53:57 UTC (rev 148880)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: damir <damir at archlinux.org>
-# Packager: Maksim Sipos (maxsipos at gmail dot com)
-
-pkgname=plotutils
-pkgver=2.6
-pkgrel=1
-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)
-md5sums=('c08a424bd2438c80a786a7f4b5bb6a40')
-sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--with-gnu-ld \
-	--with-x \
-	--enable-libplotter || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}

Copied: plotutils/repos/extra-x86_64/PKGBUILD (from rev 148654, plotutils/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:53:57 UTC (rev 148880)
@@ -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/extra-x86_64/plotutils-2.6-libpng-1.5.patch (from rev 148654, plotutils/repos/testing-x86_64/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	2012-02-05 11:53:57 UTC (rev 148880)
@@ -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 

Deleted: extra-x86_64/plotutils.install
===================================================================
--- extra-x86_64/plotutils.install	2012-02-05 11:53:53 UTC (rev 148879)
+++ extra-x86_64/plotutils.install	2012-02-05 11:53:57 UTC (rev 148880)
@@ -1,13 +0,0 @@
-infodir=/usr/share/info
-
-post_install() {
-  install-info $infodir/plotutils.info $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete $infodir/plotutils.info $infodir/dir 2> /dev/null
-}

Copied: plotutils/repos/extra-x86_64/plotutils.install (from rev 148654, plotutils/repos/testing-x86_64/plotutils.install)
===================================================================
--- extra-x86_64/plotutils.install	                        (rev 0)
+++ extra-x86_64/plotutils.install	2012-02-05 11:53:57 UTC (rev 148880)
@@ -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
+}