From owner-svn-ports-all@freebsd.org Sun Aug 13 11:19:54 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EE25DD990B; Sun, 13 Aug 2017 11:19:54 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB9706A159; Sun, 13 Aug 2017 11:19:53 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7DBJq4P025788; Sun, 13 Aug 2017 11:19:52 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7DBJqsW025786; Sun, 13 Aug 2017 11:19:52 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201708131119.v7DBJqsW025786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 13 Aug 2017 11:19:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447878 - in head/science/massxpert: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head/science/massxpert: . files X-SVN-Commit-Revision: 447878 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2017 11:19:54 -0000 Author: rakuco Date: Sun Aug 13 11:19:52 2017 New Revision: 447878 URL: https://svnweb.freebsd.org/changeset/ports/447878 Log: 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 Added: head/science/massxpert/files/patch-lib_propListHolder.cpp (contents, props changed) Modified: head/science/massxpert/Makefile Modified: head/science/massxpert/Makefile ============================================================================== --- head/science/massxpert/Makefile Sun Aug 13 11:12:59 2017 (r447877) +++ head/science/massxpert/Makefile Sun Aug 13 11:19:52 2017 (r447878) @@ -3,7 +3,7 @@ PORTNAME= massxpert PORTVERSION= 3.4.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science MASTER_SITES= http://download.tuxfamily.org/massxpert/source/ Added: head/science/massxpert/files/patch-lib_propListHolder.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/massxpert/files/patch-lib_propListHolder.cpp Sun Aug 13 11:19:52 2017 (r447878) @@ -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); +