Index: branches/2017Q3/science/massxpert/Makefile =================================================================== --- branches/2017Q3/science/massxpert/Makefile (revision 448143) +++ branches/2017Q3/science/massxpert/Makefile (revision 448144) @@ -1,31 +1,31 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= massxpert PORTVERSION= 3.4.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science MASTER_SITES= http://download.tuxfamily.org/massxpert/source/ MAINTAINER= vg@FreeBSD.org COMMENT= massXpert software for (bio)chemists LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS= libpcre.so:devel/pcre \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig USE_GCC= any USES= cmake gettext tar:bzip2 USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_GNOME= glib20 USE_QT4= corelib gui xml rcc_build qmake_build uic_build moc_build \ svg USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes .include Index: branches/2017Q3/science/massxpert/files/patch-lib_propListHolder.cpp =================================================================== --- branches/2017Q3/science/massxpert/files/patch-lib_propListHolder.cpp (nonexistent) +++ branches/2017Q3/science/massxpert/files/patch-lib_propListHolder.cpp (revision 448144) @@ -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: branches/2017Q3/science/massxpert/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 Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 448143) +++ branches/2017Q3 (revision 448144) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r447878