cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add patch to drop a wrong ';' in an if check.

Browse Source 
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
This commit is contained in:
Raphael Kubo da Costa 2017-08-13 11:19:52 +00:00
parent 389813be6e
commit 8d6300ed68
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447878
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
science/massxpert/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= massxpert
PORTVERSION= 3.4.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= science
MASTER_SITES= http://download.tuxfamily.org/massxpert/source/

19
science/massxpert/files/patch-lib_propListHolder.cpp Normal file
View File

@ -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);