<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/b1c12ea93e32324f176c923fccb06e5c8ea83a56">https://github.com/macports/macports-ports/commit/b1c12ea93e32324f176c923fccb06e5c8ea83a56</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b1c12ea qtiplot: improve patch file
</span>b1c12ea is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b1c12ea93e32324f176c923fccb06e5c8ea83a56
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Aug 23 05:09:01 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qtiplot: improve patch file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-ports/commit/032106a48718fba7e92f30f5f0cd6ace1355b89d#r34804309
</span>---
aqua/qtiplot/Portfile | 2 +-
aqua/qtiplot/files/patch-comparison.diff | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
<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 dd5a526..70e30f2 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;'>@@ -5,7 +5,7 @@ PortGroup qmake 1.0
</span>
name qtiplot
version 0.9.8.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 17
</span> categories aqua science
license GPL-2+
maintainers {nicos @NicosPavlov} openmaintainer
<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><span style='display:block; white-space:pre;color:#808080;'>index 91ad789..08e2c2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qtiplot/files/patch-comparison.diff
</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;'>@@ -1,5 +1,8 @@
</span> Avoid
error: ordered comparison between pointer and zero ('const void *' and 'int')
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch taken from FreeBSD (https://svnweb.freebsd.org/ports?view=revision&revision=487863).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- qtiplot/src/core/ApplicationWindow.cpp.orig 2019-08-20 16:39:14.000000000 -0700
+++ qtiplot/src/core/ApplicationWindow.cpp 2019-08-20 16:42:40.000000000 -0700
@@ -10933,11 +10933,11 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,12 +10,12 @@ Avoid
</span> QStringList onPlot = g->curveNamesList();
onPlot = onPlot.grep (name,TRUE);
- if (int(onPlot.count()) && plots.contains(w->objectName())<=0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (int(onPlot.count()) && plots.contains(w->objectName())<=(void*)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (onPlot.count() && !plots.contains(w->objectName()))
</span> plots << w->objectName();
}
}else if (w->isA("Graph3D")){
- if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=(void*)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((((Graph3D*)w)->formula()).contains(name,TRUE) && !plots.contains(w->objectName()))
</span> plots << w->objectName();
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +24,7 @@ Avoid
</span> {
QStringList tl = onPlot[j].split("_", QString::SkipEmptyParts);
- if (tables.contains(tl[0])<=0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (tables.contains(tl[0])<=(void*)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!tables.contains(tl[0]))
</span> tables << tl[0];
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +35,7 @@ Avoid
</span> 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){
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else if (formula.contains("(Z)",true) > (void*)0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (formula.contains("(Z)",true)){
</span> formula.remove("(X)").remove("(Y)").remove("(Z)");
QStringList l = formula.split(",");
if (l.size() < 3)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +46,7 @@ Avoid
</span> newLabel += QString::number(n);
- if (col_label.contains(newLabel) > 0){
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (col_label.contains(newLabel) > (void*)0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (col_label.contains(newLabel)){
</span> 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!"));
</pre><pre style='margin:0'>
</pre>