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

[Felix Yan]

    Date: Friday, November 9, 2018 @ 21:41:23
  Author: felixonmars
Revision: 338608

archrelease: copy trunk to staging-x86_64

Added:
  plotutils/repos/staging-x86_64/
  plotutils/repos/staging-x86_64/PKGBUILD
    (from rev 338607, plotutils/trunk/PKGBUILD)
  plotutils/repos/staging-x86_64/plotutils-2.6-libpng-1.5.patch
    (from rev 338607, plotutils/trunk/plotutils-2.6-libpng-1.5.patch)

--------------------------------+
 PKGBUILD                       |   32 ++++++++++++++++++++++++++++++++
 plotutils-2.6-libpng-1.5.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

Copied: plotutils/repos/staging-x86_64/PKGBUILD (from rev 338607, plotutils/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-11-09 21:41:23 UTC (rev 338608)
@@ -0,0 +1,32 @@
+# Maintainer: damir <damir at archlinux.org>
+# Packager: Maksim Sipos (maxsipos at gmail dot com)
+
+pkgname=plotutils
+pkgver=2.6
+pkgrel=9
+arch=('x86_64')
+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
+}

Copied: plotutils/repos/staging-x86_64/plotutils-2.6-libpng-1.5.patch (from rev 338607, 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	2018-11-09 21:41:23 UTC (rev 338608)
@@ -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