summaryrefslogtreecommitdiff
path: root/academic
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-07-24 12:43:09 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit7f020478b9da0abb624b1d887ed4be81ee28c014 (patch)
tree9ce894ebd23fa44b10947ae92aae5471ceddef8c /academic
parenteceb2339baf43c683baab6d372f47b71f314597f (diff)
downloadslackbuilds-7f020478b9da0abb624b1d887ed4be81ee28c014.tar.gz
academic/QtiPlot: Patched for building with libpng-1.6.
Thanks to slack_jack and ponce. Signed-off-by: David Spencer <baildon.research@googlemail.com>
Diffstat (limited to 'academic')
-rw-r--r--academic/QtiPlot/QtiPlot.SlackBuild3
-rw-r--r--academic/QtiPlot/qwtplot3d-libpng15.patch10
2 files changed, 13 insertions, 0 deletions
diff --git a/academic/QtiPlot/QtiPlot.SlackBuild b/academic/QtiPlot/QtiPlot.SlackBuild
index bd10844559..2b43518e93 100644
--- a/academic/QtiPlot/QtiPlot.SlackBuild
+++ b/academic/QtiPlot/QtiPlot.SlackBuild
@@ -90,6 +90,9 @@ cp -a $UNOFPLUGIN/qtiplot/src/plugins $SRCNAM-$VERSION/qtiplot/src
cp -a $UNOFPLUGIN/qtiplot/importOPJ.pro $SRCNAM-$VERSION/qtiplot
cd $SRCNAM-$VERSION
+# Patch for recent libpng (thanks to slack_jack, ponce and Arch)
+patch -p0 -d 3rdparty/qwtplot3d < $CWD/qwtplot3d-libpng15.patch
+
# Use the custom build.conf
cp $CWD/build.conf.slack build.conf
diff --git a/academic/QtiPlot/qwtplot3d-libpng15.patch b/academic/QtiPlot/qwtplot3d-libpng15.patch
new file mode 100644
index 0000000000..828f0c6d84
--- /dev/null
+++ b/academic/QtiPlot/qwtplot3d-libpng15.patch
@@ -0,0 +1,10 @@
+--- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500
++++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500
+@@ -47,6 +47,7 @@
+ #endif
+
+ #if defined(GL2PS_HAVE_LIBPNG)
++#include <zlib.h>
+ #include <png.h>
+ #endif
+