From 663e45789f542ae166fde8dcc7dee8ecbed8db31 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Tue, 4 Aug 2015 01:26:28 +0100
Subject: graphics/plotutils: Patched SlackBuild.

Fixes build failure with libpng16 on -current.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/plotutils/plotutils-2.6-libpng-1.5.patch | 31 +++++++++++++++++++++++
 graphics/plotutils/plotutils.SlackBuild           |  3 +++
 graphics/plotutils/plotutils.info                 |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 graphics/plotutils/plotutils-2.6-libpng-1.5.patch

(limited to 'graphics')

diff --git a/graphics/plotutils/plotutils-2.6-libpng-1.5.patch b/graphics/plotutils/plotutils-2.6-libpng-1.5.patch
new file mode 100644
index 0000000000000..8a10d19e560f0
--- /dev/null
+++ b/graphics/plotutils/plotutils-2.6-libpng-1.5.patch
@@ -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 
diff --git a/graphics/plotutils/plotutils.SlackBuild b/graphics/plotutils/plotutils.SlackBuild
index d935b9d413589..9f769eaaa7d27 100644
--- a/graphics/plotutils/plotutils.SlackBuild
+++ b/graphics/plotutils/plotutils.SlackBuild
@@ -51,6 +51,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix build with libpng16 (-current) (patch from Arch Linux)
+patch -p0 < $CWD/plotutils-2.6-libpng-1.5.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/graphics/plotutils/plotutils.info b/graphics/plotutils/plotutils.info
index ead3396b61511..51d93cbb9c979 100644
--- a/graphics/plotutils/plotutils.info
+++ b/graphics/plotutils/plotutils.info
@@ -1,7 +1,7 @@
 PRGNAM="plotutils"
 VERSION="2.6"
 HOMEPAGE="http://www.gnu.org/software/plotutils"
-DOWNLOAD="ftp://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz"
+DOWNLOAD="http://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz"
 MD5SUM="c08a424bd2438c80a786a7f4b5bb6a40"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3