[arch-commits] Commit in plotutils/trunk (3 files)

Eric Bélanger eric at archlinux.org
Fri Jan 27 01:30:55 UTC 2012


    Date: Thursday, January 26, 2012 @ 20:30:54
  Author: eric
Revision: 147685

upgpkg: plotutils 2.6-2

Rebuild against libpng 1.5 and libtiff 4.0

Added:
  plotutils/trunk/plotutils-2.6-libpng-1.5.patch
Modified:
  plotutils/trunk/PKGBUILD
  plotutils/trunk/plotutils.install

--------------------------------+
 PKGBUILD                       |   21 +++++++++++++--------
 plotutils-2.6-libpng-1.5.patch |   31 +++++++++++++++++++++++++++++++
 plotutils.install              |    8 +++++---
 3 files changed, 49 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-27 00:28:38 UTC (rev 147684)
+++ PKGBUILD	2012-01-27 01:30:54 UTC (rev 147685)
@@ -4,7 +4,7 @@
 
 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 @@
 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
+}

Added: plotutils-2.6-libpng-1.5.patch
===================================================================
--- plotutils-2.6-libpng-1.5.patch	                        (rev 0)
+++ plotutils-2.6-libpng-1.5.patch	2012-01-27 01:30:54 UTC (rev 147685)
@@ -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 

Modified: plotutils.install
===================================================================
--- plotutils.install	2012-01-27 00:28:38 UTC (rev 147684)
+++ plotutils.install	2012-01-27 01:30:54 UTC (rev 147685)
@@ -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 @@
 }
 
 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
 }




More information about the arch-commits mailing list