From owner-svn-ports-all@freebsd.org Sun Jun 3 23:41:54 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77BF6FEE0FD; Sun, 3 Jun 2018 23:41:54 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2DAD584341; Sun, 3 Jun 2018 23:41:54 +0000 (UTC) (envelope-from truckman@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0F8D425745; Sun, 3 Jun 2018 23:41:54 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w53NfrmC002306; Sun, 3 Jun 2018 23:41:53 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w53NfrGa002305; Sun, 3 Jun 2018 23:41:53 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201806032341.w53NfrGa002305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sun, 3 Jun 2018 23:41:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471526 - in head/cad/qfsm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in head/cad/qfsm: . files X-SVN-Commit-Revision: 471526 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.26 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, 03 Jun 2018 23:41:54 -0000 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(); +