aboutsummaryrefslogtreecommitdiff
path: root/science/massxpert
diff options
context:
space:
mode:
Diffstat (limited to 'science/massxpert')
-rw-r--r--science/massxpert/Makefile2
-rw-r--r--science/massxpert/files/patch-lib_propListHolder.cpp19
2 files changed, 20 insertions, 1 deletions
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index 5cde629e243e..491d3a5b9fe5 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -3,7 +3,7 @@
PORTNAME= massxpert
PORTVERSION= 3.4.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= science
MASTER_SITES= http://download.tuxfamily.org/massxpert/source/
diff --git a/science/massxpert/files/patch-lib_propListHolder.cpp b/science/massxpert/files/patch-lib_propListHolder.cpp
new file mode 100644
index 000000000000..b6f037a8009c
--- /dev/null
+++ b/science/massxpert/files/patch-lib_propListHolder.cpp
@@ -0,0 +1,19 @@
+Fixes the build with GCC 6 (in addition to fixing an actual bug).
+
+/wrkdirs/usr/ports/science/massxpert/work/massxpert-3.4.0/lib/propListHolder.cpp: In member function 'bool massXpert::PropListHolder::removeProp(const QString&)':
+/wrkdirs/usr/ports/science/massxpert/work/massxpert-3.4.0/lib/propListHolder.cpp:216:2: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
+ if(m_propList.at(iter)->name() == name);
+ ^~
+/wrkdirs/usr/ports/science/massxpert/work/massxpert-3.4.0/lib/propListHolder.cpp:217:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
+ {
+--- lib/propListHolder.cpp.orig 2017-07-26 17:06:18 UTC
++++ lib/propListHolder.cpp
+@@ -213,7 +213,7 @@ namespace massXpert
+ {
+ for (int iter = 0; iter < m_propList.size(); ++iter)
+ {
+- if(m_propList.at(iter)->name() == name);
++ if(m_propList.at(iter)->name() == name)
+ {
+ m_propList.removeAt(iter);
+