Date: Sun, 22 Mar 2015 00:06:35 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381882 - in head/science/massxpert: . files Message-ID: <201503220006.t2M06ZdG024064@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Mar 22 00:06:34 2015 New Revision: 381882 URL: https://svnweb.freebsd.org/changeset/ports/381882 QAT: https://qat.redports.org/buildarchive/r381882/ Log: science/massxpert: Fix two logical errors (found by gcc5) There were two boolean logic issues found by gcc5 when compiling massxpert. One was comparing boolean output to a negative integer (is always false) and the other applied the "not" operator in the wrong place. Fix provided per request by maintainer. PR: 197823 Added: head/science/massxpert/files/patch-lib_cleaveSpec.cpp (contents, props changed) head/science/massxpert/files/patch-plugins-src_seqToolsPlugin_seqToolsPluginDlg.cpp (contents, props changed) Modified: head/science/massxpert/Makefile Modified: head/science/massxpert/Makefile ============================================================================== --- head/science/massxpert/Makefile Sat Mar 21 23:46:17 2015 (r381881) +++ head/science/massxpert/Makefile Sun Mar 22 00:06:34 2015 (r381882) @@ -3,12 +3,12 @@ PORTNAME= massxpert PORTVERSION= 3.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MASTER_SITES= http://download.tuxfamily.org/massxpert/source/ MAINTAINER= vg@FreeBSD.org -COMMENT= The massXpert software for (bio)chemists +COMMENT= massXpert software for (bio)chemists LICENSE= GPLv3 Added: head/science/massxpert/files/patch-lib_cleaveSpec.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/massxpert/files/patch-lib_cleaveSpec.cpp Sun Mar 22 00:06:34 2015 (r381882) @@ -0,0 +1,11 @@ +--- lib/cleaveSpec.cpp.orig 2012-12-25 21:02:43 UTC ++++ lib/cleaveSpec.cpp +@@ -427,7 +427,7 @@ namespace massXpert + return false; + + +- if (parse() == -1) ++ if (parse() == false) + return false; + + // If there are rules, we have to check them all. Added: head/science/massxpert/files/patch-plugins-src_seqToolsPlugin_seqToolsPluginDlg.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/massxpert/files/patch-plugins-src_seqToolsPlugin_seqToolsPluginDlg.cpp Sun Mar 22 00:06:34 2015 (r381882) @@ -0,0 +1,11 @@ +--- plugins-src/seqToolsPlugin/seqToolsPluginDlg.cpp.orig 2012-12-25 21:02:43 UTC ++++ plugins-src/seqToolsPlugin/seqToolsPluginDlg.cpp +@@ -215,7 +215,7 @@ SeqToolsPluginDlg::loadDictionary () + + QStringList stringList = line.split (">", QString::SkipEmptyParts); + +- if (!stringList.size () == 2) ++ if (stringList.size () != 2) + { + QMessageBox::warning (this, + tr ("Sequence Manipulation Tools Plugin"),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503220006.t2M06ZdG024064>