From owner-svn-ports-all@freebsd.org Wed Aug 29 20:49:03 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 7A3531095F77; Wed, 29 Aug 2018 20:49:03 +0000 (UTC) (envelope-from adridg@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 3AD2A813B7; Wed, 29 Aug 2018 20:49:03 +0000 (UTC) (envelope-from adridg@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 037D322497; Wed, 29 Aug 2018 20:49:03 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7TKn2Ea021832; Wed, 29 Aug 2018 20:49:02 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7TKn20E021830; Wed, 29 Aug 2018 20:49:02 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201808292049.w7TKn20E021830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Wed, 29 Aug 2018 20:49:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478418 - in head/games: kolf-kde4/files ksirk-kde4/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/games: kolf-kde4/files ksirk-kde4/files X-SVN-Commit-Revision: 478418 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.27 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: Wed, 29 Aug 2018 20:49:03 -0000 Author: adridg Date: Wed Aug 29 20:49:02 2018 New Revision: 478418 URL: https://svnweb.freebsd.org/changeset/ports/478418 Log: Clang7 fixes for some old soon-to-be-deprecated KDE4 games. PR: 230938 230942 Reported by: jbeich Added: head/games/kolf-kde4/files/ head/games/kolf-kde4/files/patch-kcomboboxdialog.cpp (contents, props changed) head/games/kolf-kde4/files/patch-newgame.cpp (contents, props changed) head/games/ksirk-kde4/files/ head/games/ksirk-kde4/files/patch-ksirk_iris_src_xmpp_xmpp-im_filetransfer.cpp (contents, props changed) Added: head/games/kolf-kde4/files/patch-kcomboboxdialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/kolf-kde4/files/patch-kcomboboxdialog.cpp Wed Aug 29 20:49:02 2018 (r478418) @@ -0,0 +1,11 @@ +--- kcomboboxdialog.cpp.orig 2018-08-29 20:31:46 UTC ++++ kcomboboxdialog.cpp +@@ -94,7 +94,7 @@ QString KComboBoxDialog::getItem( const + KConfigGroup *configGroup = new KConfigGroup(config->group("Notification Messages")); + prevAnswer = configGroup->readEntry( dontAskAgainName,QString() ); + if ( !prevAnswer.isEmpty() ) +- if ( _items.contains( prevAnswer ) > 0 ) ++ if ( bool(_items.contains( prevAnswer ) ) ) + return prevAnswer; + } + Added: head/games/kolf-kde4/files/patch-newgame.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/kolf-kde4/files/patch-newgame.cpp Wed Aug 29 20:49:02 2018 (r478418) @@ -0,0 +1,11 @@ +--- newgame.cpp.orig 2018-08-29 20:35:41 UTC ++++ newgame.cpp +@@ -285,7 +285,7 @@ void NewGameDialog::addCourse() + + for (QStringList::const_iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt) + { +- if (names.contains(*fileIt) > 0) ++ if (bool(names.contains(*fileIt))) + { + hasDuplicates = true; + continue; Added: head/games/ksirk-kde4/files/patch-ksirk_iris_src_xmpp_xmpp-im_filetransfer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/ksirk-kde4/files/patch-ksirk_iris_src_xmpp_xmpp-im_filetransfer.cpp Wed Aug 29 20:49:02 2018 (r478418) @@ -0,0 +1,11 @@ +--- ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp.orig 2018-08-29 15:45:06 UTC ++++ ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp +@@ -396,7 +396,7 @@ FileTransfer *FileTransferManager::takeI + + bool FileTransferManager::isActive(const FileTransfer *ft) const + { +- return d->list.contains(const_cast(ft)) > 0; ++ return bool(d->list.contains(const_cast(ft))); + } + + void FileTransferManager::pft_incoming(const FTRequest &req)