diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2017-08-13 11:19:52 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2017-08-13 11:19:52 +0000 |
| commit | 8d6300ed686f28b7c766541f67105acf182eb061 (patch) | |
| tree | 8d7e2cba5d3f9521d10bbd1454bb16bcd08d8898 /science/massxpert | |
| parent | 389813be6ece0c8483b3d095597b51c392920fcd (diff) | |
| download | ports-8d6300ed686f28b7c766541f67105acf182eb061.tar.gz ports-8d6300ed686f28b7c766541f67105acf182eb061.zip | |
Add patch to drop a wrong ';' in an if check.
In addition to fixing an actual bug, this also fixes the build with GCC 6:
/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'
{
PR: 219293
Approved by: maintainer timeout (vg, 18 days)
MFH: 2017Q3
Notes
Notes:
svn path=/head/; revision=447878
Diffstat (limited to 'science/massxpert')
| -rw-r--r-- | science/massxpert/Makefile | 2 | ||||
| -rw-r--r-- | science/massxpert/files/patch-lib_propListHolder.cpp | 19 |
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); + |