<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/032106a48718fba7e92f30f5f0cd6ace1355b89d">https://github.com/macports/macports-ports/commit/032106a48718fba7e92f30f5f0cd6ace1355b89d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 032106a48718fba7e92f30f5f0cd6ace1355b89d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Aug 20 16:51:56 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qtiplot: fix build on newer version of Clang
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Avoid
</span><span style='display:block; white-space:pre;color:#404040;'> error: ordered comparison between pointer and zero
</span><span style='display:block; white-space:pre;color:#404040;'> ('const void *' and 'int')
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span>---
aqua/qtiplot/Portfile | 3 +-
aqua/qtiplot/files/patch-comparison.diff | 49 ++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qtiplot/Portfile b/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83c6b21..dd5a526 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,8 @@ patchfiles patch-ApplicationWindow.diff \
</span> patch-scripting.pri.diff \
patch-qwt3d_openglhelper.diff \
patch-gsl2.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sip-4.15.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sip-4.15.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-comparison.diff
</span>
pre-configure {
# don't step into the manual dir, we don't have all the tools to build it
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qtiplot/files/patch-comparison.diff b/aqua/qtiplot/files/patch-comparison.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..91ad789
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qtiplot/files/patch-comparison.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error: ordered comparison between pointer and zero ('const void *' and 'int')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/core/ApplicationWindow.cpp.orig 2019-08-20 16:39:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/core/ApplicationWindow.cpp 2019-08-20 16:42:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10933,11 +10933,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(Graph *g, layers){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStringList onPlot = g->curveNamesList();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ onPlot = onPlot.grep (name,TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (int(onPlot.count()) && plots.contains(w->objectName())<=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (int(onPlot.count()) && plots.contains(w->objectName())<=(void*)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plots << w->objectName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }else if (w->isA("Graph3D")){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=(void*)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plots << w->objectName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10954,7 +10954,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int j=0; j<onPlot.count(); j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStringList tl = onPlot[j].split("_", QString::SkipEmptyParts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (tables.contains(tl[0])<=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (tables.contains(tl[0])<=(void*)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tables << tl[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/plot3D/Graph3D.cpp.orig 2011-08-24 12:25:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/plot3D/Graph3D.cpp 2019-08-20 16:43:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3283,7 +3283,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plot->addRibbon(t, l[0], l[1], fList[2].toDouble(), fList[3].toDouble(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fList[4].toDouble(), fList[5].toDouble(), fList[6].toDouble(), fList[7].toDouble());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else if (formula.contains("(Z)",true) > 0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (formula.contains("(Z)",true) > (void*)0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ formula.remove("(X)").remove("(Y)").remove("(Z)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStringList l = formula.split(",");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (l.size() < 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/table/Table.cpp.orig 2011-09-13 13:20:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/table/Table.cpp 2019-08-20 16:37:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1080,7 +1080,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (enumerateRight)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ newLabel += QString::number(n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (col_label.contains(newLabel) > 0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (col_label.contains(newLabel) > (void*)0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (warn){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMessageBox::critical(0, tr("QtiPlot - Error"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tr("There is already a column called : <b>"+newLabel+"</b> in table <b>"+caption+"</b>!<p>Please choose another name!"));
</span></pre><pre style='margin:0'>
</pre>