From owner-svn-ports-all@freebsd.org Thu Aug 30 09:56:49 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 AAB61109A5A9; Thu, 30 Aug 2018 09:56:49 +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 4F05B79E3A; Thu, 30 Aug 2018 09:56:49 +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 2BAEE2A05; Thu, 30 Aug 2018 09:56:49 +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 w7U9unFA027916; Thu, 30 Aug 2018 09:56:49 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7U9umMV027912; Thu, 30 Aug 2018 09:56:48 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201808300956.w7U9umMV027912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 30 Aug 2018 09:56:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478438 - head/x11-fm/krusader2-kde4/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/x11-fm/krusader2-kde4/files X-SVN-Commit-Revision: 478438 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: Thu, 30 Aug 2018 09:56:50 -0000 Author: adridg Date: Thu Aug 30 09:56:48 2018 New Revision: 478438 URL: https://svnweb.freebsd.org/changeset/ports/478438 Log: Fix clang7 build. PR: 230939 Reported by: jbeich Added: head/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp (contents, props changed) head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp (contents, props changed) head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp (contents, props changed) head/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp (contents, props changed) Added: head/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp Thu Aug 30 09:56:48 2018 (r478438) @@ -0,0 +1,11 @@ +--- krusader/Dialogs/packgui.cpp.orig 2018-08-30 09:48:14 UTC ++++ krusader/Dialogs/packgui.cpp +@@ -40,7 +40,7 @@ + #include + #include + +-#define PS(x) lst.contains(x)>0 ++#define PS(x) bool(lst.contains(x)) + + // clear the statics first + QString PackGUI::filename = 0; Added: head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp Thu Aug 30 09:56:48 2018 (r478438) @@ -0,0 +1,11 @@ +--- krusader/Konfigurator/kgarchives.cpp.orig 2018-08-30 09:48:24 UTC ++++ krusader/Konfigurator/kgarchives.cpp +@@ -163,7 +163,7 @@ void KgArchives::slotAutoConfigure() + + void KgArchives::disableNonExistingPackers() + { +-#define PS(x) lst.contains(x)>0 ++#define PS(x) bool(lst.contains(x)) + + // get list of available packers + QStringList lst = KRarcHandler::supportedPackers(); Added: head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp Thu Aug 30 09:56:48 2018 (r478438) @@ -0,0 +1,11 @@ +--- krusader/Konfigurator/krresulttable.cpp.orig 2018-08-30 09:48:49 UTC ++++ krusader/Konfigurator/krresulttable.cpp +@@ -27,7 +27,7 @@ + + using namespace std; + +-#define PS(x) _supported.contains(x)>0 ++#define PS(x) bool(_supported.contains(x)) + + KrResultTable::KrResultTable(QWidget* parent) + : QWidget(parent), Added: head/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp Thu Aug 30 09:56:48 2018 (r478438) @@ -0,0 +1,24 @@ +--- krusader/MountMan/kmountman.cpp.orig 2018-08-30 09:48:03 UTC ++++ krusader/MountMan/kmountman.cpp +@@ -109,18 +109,18 @@ KMountMan::~KMountMan() {} + + bool KMountMan::invalidFilesystem(QString type) + { +- return (invalid_fs.contains(type) > 0); ++ return (invalid_fs.contains(type)); + } + + // this is an ugly hack, but type can actually be a mountpoint. oh well... + bool KMountMan::nonmountFilesystem(QString type, QString mntPoint) + { +- return((nonmount_fs.contains(type) > 0) || (nonmount_fs_mntpoint.contains(mntPoint) > 0)); ++ return(bool(nonmount_fs.contains(type)) || bool(nonmount_fs_mntpoint.contains(mntPoint))); + } + + bool KMountMan::networkFilesystem(QString type) + { +- return (network_fs.contains(type) > 0); ++ return (network_fs.contains(type)); + } + + void KMountMan::mainWindow()