Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 20 Dec 2018 08:47:19 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r487863 - head/math/qtiplot/files
Message-ID:  <201812200847.wBK8lJ6x071432@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: makc
Date: Thu Dec 20 08:47:18 2018
New Revision: 487863
URL: https://svnweb.freebsd.org/changeset/ports/487863

Log:
  math/qtiplot:
  - Add patched to fix build with Clang 7

Added:
  head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp   (contents, props changed)
  head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp   (contents, props changed)
Modified:
  head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp

Added: head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp	Thu Dec 20 08:47:18 2018	(r487863)
@@ -0,0 +1,25 @@
+--- qtiplot/src/core/ApplicationWindow.cpp.orig	2018-12-20 07:24:36 UTC
++++ qtiplot/src/core/ApplicationWindow.cpp
+@@ -10933,11 +10933,11 @@ QStringList ApplicationWindow::depending
+ 			foreach(Graph *g, layers){
+ 				QStringList onPlot = g->curveNamesList();
+ 				onPlot = onPlot.grep (name,TRUE);
+-				if (int(onPlot.count()) && plots.contains(w->objectName())<=0)
++				if (onPlot.count() && !plots.contains(w->objectName()))
+ 					plots << w->objectName();
+ 			}
+ 		}else if (w->isA("Graph3D")){
+-			if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=0)
++			if ((((Graph3D*)w)->formula()).contains(name,TRUE) && !plots.contains(w->objectName()))
+ 				plots << w->objectName();
+ 		}
+ 	}
+@@ -10954,7 +10954,7 @@ QStringList ApplicationWindow::multilaye
+ 		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]))
+ 				tables << tl[0];
+ 		}
+ 	}

Added: head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp	Thu Dec 20 08:47:18 2018	(r487863)
@@ -0,0 +1,11 @@
+--- qtiplot/src/plot3D/Graph3D.cpp.orig	2011-08-24 10:25:10 UTC
++++ qtiplot/src/plot3D/Graph3D.cpp
+@@ -3283,7 +3283,7 @@ Graph3D* Graph3D::restore(ApplicationWin
+ 				return 0;
+ 			plot->addRibbon(t, l[0], l[1], fList[2].toDouble(), fList[3].toDouble(),
+ 					fList[4].toDouble(), fList[5].toDouble(), fList[6].toDouble(), fList[7].toDouble());
+-		} else if (formula.contains("(Z)",true) > 0){
++		} else if (formula.contains("(Z)",true)){
+ 			formula.remove("(X)").remove("(Y)").remove("(Z)");
+ 			QStringList l = formula.split(",");
+ 			if (l.size() < 3)

Modified: head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp
==============================================================================
--- head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp	Thu Dec 20 08:43:24 2018	(r487862)
+++ head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp	Thu Dec 20 08:47:18 2018	(r487863)
@@ -16,3 +16,12 @@ Index: qtiplot/qtiplot/src/table/Table.cpp
      mup->defineVariable("j", (double)col);
      mup->defineVariable("sr", startRow + 1.0);
      mup->defineVariable("er", endRow + 1.0);
+@@ -1080,7 +1080,7 @@ void Table::setColName(int col, const QS
+ 		if (enumerateRight)
+             newLabel += QString::number(n);
+ 
+-		if (col_label.contains(newLabel) > 0){
++		if (col_label.contains(newLabel)){
+ 			if (warn){
+ 				QMessageBox::critical(0, tr("QtiPlot - Error"),
+ 				tr("There is already a column called : <b>"+newLabel+"</b> in table <b>"+caption+"</b>!<p>Please choose another name!"));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812200847.wBK8lJ6x071432>