scidavis: update to version 1.25

science/scidavis/Portfile

@@ -6,7 +6,7 @@ PortGroup           compiler_blacklist_versions 1.0
 PortGroup           cxx11 1.1
 
 name                scidavis
-version             1.23
+version             1.25
 categories          science
 license             GPL-2+
 maintainers         {nicos @NicosPavlov} openmaintainer
@@ -34,13 +34,14 @@ depends_lib-append  port:qwt52 \
                     port:zlib \
                     port:libGLU
 
-checksums           rmd160  9d046cf2196c4a109f800446cefbff623dda11df \
-                    sha256  4cd8d39e8392f9ba9aaa80c2a42836e23307cce28001833f41bf8cf9908de0b1 \
-                    size    3167963
+checksums           rmd160  8a09d65a53f1280cbca929ef89bb2a4be36aebd0 \
+                    sha256  7b363e7e9ad7223134f781a04c8da1808efb815fa125fc1ad76fe239b4babf11 \
+                    size    9714594
 
 universal_variant   no
 
-patchfiles          patch-OriginObj.diff
+patchfiles          patch-OriginObj.diff \
+                    patch-nullComparison.diff
 
 configure.pre_args-append   "'CONFIG+=osx_dist noassistant'"
 

science/scidavis/files/patch-nullComparison.diff

@@ -0,0 +1,58 @@
+diff -ur ../scidavis-1.25-orig/libscidavis/src/ApplicationWindow.cpp ./libscidavis/src/ApplicationWindow.cpp
+--- ../scidavis-1.25-orig/libscidavis/src/ApplicationWindow.cpp	2019-03-05 08:49:55.000000000 +0900
++++ ./libscidavis/src/ApplicationWindow.cpp	2019-04-01 00:27:10.000000000 +0900
+@@ -5173,7 +5173,7 @@
+
+ 	if (w->inherits("Table")){
+ 		QStringList labels=((Table *)w)->colNames();
+-		if (labels.contains(newName)>0){
++		if (labels.contains(newName)!=NULL){
+ 			QMessageBox::critical(this, tr("Error"),
+ 					tr("The table name must be different from the names of its columns!")+"<p>"+tr("Please choose another name!"));
+ 			return false;
+@@ -7849,13 +7849,13 @@
+ 				Graph *g = (Graph *)widget;
+ 				onPlot = g->curvesList();
+ 				onPlot = onPlot.filter(QRegExp("^"+name+"_.*"));
+-				if (onPlot.count() > 0 && plots.contains(w->name()) <= 0 )
++				if (onPlot.count() > 0 && plots.contains(w->name()) == NULL )
+ 					plots << w->name();
+ 			}
+ 		}
+ 		else if (w->inherits("Graph3D"))
+ 		{
+-			if ((((Graph3D*)w)->formula()).contains(name,Qt::CaseSensitive) && plots.contains(w->name())<=0)
++			if ((((Graph3D*)w)->formula()).contains(name,Qt::CaseSensitive) && plots.contains(w->name())==NULL)
+ 				plots << w->name();
+ 		}
+ 	}
+@@ -7874,7 +7874,7 @@
+ 		for (int j=0; j<onPlot.count(); j++)
+ 		{
+ 			QStringList tl = onPlot[j].split("_", QString::SkipEmptyParts);
+-			if (tables.contains(tl[0])<=0)
++			if (tables.contains(tl[0])==NULL)
+ 				tables << tl[0];
+ 		}
+ 	}
+@@ -10088,7 +10088,7 @@
+ 	if (fList[1].endsWith("(Y)",Qt::CaseSensitive))//Ribbon plot
+ 		plot=app->dataPlot3D(caption, fList[1],fList[2].toDouble(),fList[3].toDouble(),
+ 				fList[4].toDouble(),fList[5].toDouble(),fList[6].toDouble(),fList[7].toDouble());
+-	else if (fList[1].contains("(Z)",Qt::CaseSensitive) > 0)
++	else if (fList[1].contains("(Z)",Qt::CaseSensitive) != NULL)
+ 		plot=app->dataPlotXYZ(caption, fList[1], fList[2].toDouble(),fList[3].toDouble(),
+ 				fList[4].toDouble(),fList[5].toDouble(),fList[6].toDouble(),fList[7].toDouble());
+ 	else if (fList[1].startsWith("matrix<",Qt::CaseSensitive) && fList[1].endsWith(">",Qt::CaseInsensitive))
+diff -ur ../scidavis-1.25-orig/libscidavis/src/FitDialog.cpp ./libscidavis/src/FitDialog.cpp
+--- ../scidavis-1.25-orig/libscidavis/src/FitDialog.cpp	2019-03-05 08:49:55.000000000 +0900
++++ ./libscidavis/src/FitDialog.cpp	2019-04-01 00:31:31.000000000 +0900
+@@ -1035,7 +1035,7 @@
+ {
+ 	QString curve = boxCurve->currentText();
+ 	QStringList curvesList = d_graph->curvesList();
+-	if (curvesList.contains(curve) <= 0)
++	if (curvesList.contains(curve) == NULL)
+ 	{
+ 		QMessageBox::critical(this,tr("Warning"),
+ 				tr("The curve <b> %1 </b> doesn't exist anymore! Operation aborted!").arg(curve));