Date: Thu, 17 Aug 2017 16:28:15 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448144 - in branches/2017Q3/science/massxpert: . files Message-ID: <201708171628.v7HGSFmf017754@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Thu Aug 17 16:28:15 2017 New Revision: 448144 URL: https://svnweb.freebsd.org/changeset/ports/448144 Log: MFH: r447878 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) Approved by: ports-secteam (feld) Added: branches/2017Q3/science/massxpert/files/patch-lib_propListHolder.cpp - copied unchanged from r447878, head/science/massxpert/files/patch-lib_propListHolder.cpp Modified: branches/2017Q3/science/massxpert/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/science/massxpert/Makefile ============================================================================== --- branches/2017Q3/science/massxpert/Makefile Thu Aug 17 16:27:13 2017 (r448143) +++ branches/2017Q3/science/massxpert/Makefile Thu Aug 17 16:28:15 2017 (r448144) @@ -3,7 +3,7 @@ PORTNAME= massxpert PORTVERSION= 3.4.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science MASTER_SITES= http://download.tuxfamily.org/massxpert/source/ Copied: branches/2017Q3/science/massxpert/files/patch-lib_propListHolder.cpp (from r447878, head/science/massxpert/files/patch-lib_propListHolder.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/science/massxpert/files/patch-lib_propListHolder.cpp Thu Aug 17 16:28:15 2017 (r448144, copy of r447878, head/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); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708171628.v7HGSFmf017754>