From 374a2a0e9e35c6be5f5901f418780af1b476dfa0 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 22 Feb 2016 20:25:03 +0100
Subject: [PATCH] gnuplot: update to 5.0.3

---
 srcpkgs/gnuplot/patches/musl-isnan.patch | 13 +++++++++++++
 srcpkgs/gnuplot/template                 | 22 +++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/gnuplot/patches/musl-isnan.patch

diff --git a/srcpkgs/gnuplot/patches/musl-isnan.patch b/srcpkgs/gnuplot/patches/musl-isnan.patch
new file mode 100644
index 0000000000..e64c09e841
--- /dev/null
+++ b/srcpkgs/gnuplot/patches/musl-isnan.patch
@@ -0,0 +1,13 @@
+diff --git src/qtterminal/qt_conversion.cpp src/qtterminal/qt_conversion.cpp
+index 38fd177..95ee48c 100644
+--- src/qtterminal/qt_conversion.cpp
++++ src/qtterminal/qt_conversion.cpp
+@@ -126,7 +126,7 @@ QImage qt_imageToQImage(int M, int N, coordval* image, t_imagecolor color_mode)
+ 			QRgb* line = (QRgb*)(qimage.scanLine(n));
+ 			for (int m = 0; m < M; m++)
+ 			{
+-				if (isnan(*image))
++				if (std::isnan(*image))
+ 				{
+ 					image++;
+ 					*line++ = 0x00000000;
diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template
index 857a30bacd..af65d03bda 100644
--- a/srcpkgs/gnuplot/template
+++ b/srcpkgs/gnuplot/template
@@ -1,24 +1,21 @@
 # Template file for 'gnuplot'
 pkgname=gnuplot
-version=5.0.2
-revision=2
+version=5.0.3
+revision=1
 configure_args="--with-readline=builtin"
 hostmakedepends="pkg-config lua52"
 makedepends="zlib-devel libX11-devel gd-devel lua52-devel"
 depends="gnuplot-common>=${version}_${revision}"
-replaces="gnuplot<4.6.6_1"
 short_desc="Command-line driven graphing utility"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 homepage="http://www.gnuplot.info/"
 license="gnuplot"
 distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
-checksum=5a2b31d375f56d29272193370705164cde49545a332841183bcca44f02b1d890
-
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
+checksum=5f6ee35f3f22014058e999911934bfa9db28e02a2722a7001c192cd182b8c715
 
 subpackages="gnuplot-common"
 if [ -z "$CROSS_BUILD" ]; then
-	makedepends+=" cairo-devel pango-devel wxWidgets-devel qt-devel"
+	makedepends+=" cairo-devel pango-devel wxWidgets-devel qt5-tools-devel qt5-svg-devel"
 	subpackages+=" gnuplot-wx gnuplot-qt"
 fi
 
@@ -44,13 +41,10 @@ pre_configure() {
 		cp -a x11 qt
 	fi
 }
-
 do_configure() {
-	export LUA_CFLAGS="-L${XBPS_CROSS_BASE}/usr/include/lua5.2"
-	export LUA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -llua5.2"
 	if [ -z "$CROSS_BUILD" ]; then
 		cd ${wrksrc}/x11
-		./configure ${configure_args} --without-qt --disable-wxwidgets --without-cairo --disable-wxt
+		./configure ${configure_args} --disable-wxwidgets --without-cairo --without-qt
 		cd ${wrksrc}/wx
 		./configure ${configure_args} --without-qt ac_cv_path_WX_CONFIG=/usr/bin/wx-config-3.0 LIBS="-lX11"
 		cd ${wrksrc}/qt
@@ -60,7 +54,6 @@ do_configure() {
 		./configure ${configure_args}
 	fi
 }
-
 do_build() {
 	if [ -z "$CROSS_BUILD" ]; then
 		make -C wx ${makejobs}
@@ -68,7 +61,6 @@ do_build() {
 	fi
 	make -C x11 ${makejobs}
 }
-
 do_install() {
 	# install x11 and rename binary
 	make -C x11 DESTDIR=${DESTDIR} install
@@ -91,7 +83,6 @@ do_install() {
 }
 
 gnuplot-common_package() {
-	replaces="gnuplot<4.6.6_1"
 	short_desc+=" - common files"
 	pkg_install() {
 		vmove usr/share/gnuplot/${version%.*}/PostScript
@@ -105,9 +96,7 @@ gnuplot-common_package() {
 		vmove usr/share/man/man1/gnuplot.1
 	}
 }
-
 gnuplot-wx_package() {
-	replaces="gnuplot<4.6.6_1"
 	depends="gnuplot-common>=${version}_${revision}"
 	short_desc+=" - wxWidgets frontend"
 	alternatives="gnuplot:gnuplot:/usr/bin/gnuplot-wx"
@@ -115,7 +104,6 @@ gnuplot-wx_package() {
 		vmove usr/bin/gnuplot-wx
 	}
 }
-
 gnuplot-qt_package() {
 	depends="gnuplot-common>=${version}_${revision}"
 	short_desc+=" - Qt frontend"