[143238] trunk/dports/math/gnuplot

[mojca at macports.org]

Revision: 143238
          https://trac.macports.org/changeset/143238
Author:   mojca at macports.org
Date:     2015-12-09 02:45:06 -0800 (Wed, 09 Dec 2015)
Log Message:
-----------
gnuplot: fix dependency on qt5

Modified Paths:
--------------
    trunk/dports/math/gnuplot/Portfile

Added Paths:
-----------
    trunk/dports/math/gnuplot/files/patch-src-qtterminal-qt_conversion.cpp.diff

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2015-12-09 10:24:39 UTC (rev 143237)
+++ trunk/dports/math/gnuplot/Portfile	2015-12-09 10:45:06 UTC (rev 143238)
@@ -8,7 +8,7 @@
 
 name                gnuplot
 version             5.0.1
-revision            3
+revision            4
 categories          math science
 # the license has some inconvenient requirements that we're not meeting
 # to be allowed to distribute binaries
@@ -53,6 +53,7 @@
 
 patchfiles          patch-configure.diff \
                     patch-term-lua.trm.diff
+#                   patch-src-qtterminal-qt_conversion.cpp.diff
 
 configure.args      --with-caca=${prefix} \
                     --with-gd=${prefix} \
@@ -109,7 +110,11 @@
 }
 
 variant qt5 conflicts qt description "Enable qt terminal with Qt 5" {
-    depends_lib-append          port:qt5-mac
+    if { ${configure.cxx_stdlib} ne "libc++" } {
+        ui_warn "Gnuplot should be compiled against libc++ if you want to use Qt 5."
+    }
+
+    depends_lib-append          port:qt5
     configure.env-append        "PKG_CONFIG_PATH=${prefix}/libexec/qt5-mac/lib/pkgconfig"
 
     configure.args-replace      --without-qt --with-qt=qt5

Added: trunk/dports/math/gnuplot/files/patch-src-qtterminal-qt_conversion.cpp.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-src-qtterminal-qt_conversion.cpp.diff	                        (rev 0)
+++ trunk/dports/math/gnuplot/files/patch-src-qtterminal-qt_conversion.cpp.diff	2015-12-09 10:45:06 UTC (rev 143238)
@@ -0,0 +1,11 @@
+--- src/qtterminal/qt_conversion.cpp.orig
++++ 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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/fb4f9704/attachment.html>