Date: Sun, 3 Jun 2018 23:41:53 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471526 - in head/cad/qfsm: . files Message-ID: <201806032341.w53NfrGa002305@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Sun Jun 3 23:41:53 2018 New Revision: 471526 URL: https://svnweb.freebsd.org/changeset/ports/471526 Log: Unbreak qfsm build with clang 6.0 by fixing two instances of: error: cannot initialize return object of type 'Project *' with an rvalue of type 'bool' Pet portlint. Added: head/cad/qfsm/files/patch-src_FileIO.cpp (contents, props changed) Modified: head/cad/qfsm/Makefile Modified: head/cad/qfsm/Makefile ============================================================================== --- head/cad/qfsm/Makefile Sun Jun 3 23:20:14 2018 (r471525) +++ head/cad/qfsm/Makefile Sun Jun 3 23:41:53 2018 (r471526) @@ -14,10 +14,10 @@ LICENSE= GPLv3+ OPTIONS_DEFINE= GRAPHVIZ DOCS EXAMPLES +USES= tar:bzip2 cmake desktop-file-utils USE_XORG= xi USE_QT4= corelib gui qt3support svg xml \ moc_build qmake_build rcc_build uic_build -USES= tar:bzip2 cmake desktop-file-utils INSTALLS_ICONS= yes GRAPHVIZ_BUILD_DEPENDS= graphviz>=2.22:graphics/graphviz Added: head/cad/qfsm/files/patch-src_FileIO.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/qfsm/files/patch-src_FileIO.cpp Sun Jun 3 23:41:53 2018 (r471526) @@ -0,0 +1,20 @@ +--- src/FileIO.cpp.orig 2015-01-02 18:01:46 UTC ++++ src/FileIO.cpp +@@ -1617,7 +1617,7 @@ Project* FileIO::importFile(Import* imp, ScrollView* s + QString ext; + + if (!imp) +- return FALSE; ++ return NULL; + + Project* p=NULL; + importdlg->setAcceptMode(QFileDialog::AcceptOpen); +@@ -1641,7 +1641,7 @@ Project* FileIO::importFile(Import* imp, ScrollView* s + ifstream fin(act_importfile); + + if (!fin) +- return FALSE; ++ return NULL; + + emit setWaitCursor(); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806032341.w53NfrGa002305>