Attachment 184742 Details for Bug 219293 – Proposed patch

[patch] Proposed patch

massxpert.diff (text/plain), 1.82 KB, created by Raphael Kubo da Costa on 2017-07-26 17:22:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2017-07-26 17:22:27 UTC

Size: 1.82 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 446662)
>+++ Makefile	(working copy)
>@@ -26,6 +26,5 @@
> USE_QT4=	corelib gui xml rcc_build qmake_build uic_build moc_build \
> 		svg
> USE_LDCONFIG=	yes
>-MAKE_JOBS_UNSAFE=	yes
> 
> .include <bsd.port.mk>
>Index: files/patch-lib_propListHolder.cpp
>===================================================================
>--- files/patch-lib_propListHolder.cpp	(nonexistent)
>+++ files/patch-lib_propListHolder.cpp	(working copy)
>@@ -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);
>+ 	  
>
>Property changes on: files/patch-lib_propListHolder.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 219293: 184742