From owner-svn-ports-all@freebsd.org Sun Aug 26 09:39:33 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 002C8106F68B; Sun, 26 Aug 2018 09:39:32 +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 A6F38784C6; Sun, 26 Aug 2018 09:39:32 +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 87F8B525B; Sun, 26 Aug 2018 09:39:32 +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 w7Q9dWG6033782; Sun, 26 Aug 2018 09:39:32 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7Q9dWI9033780; Sun, 26 Aug 2018 09:39:32 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201808260939.w7Q9dWI9033780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 26 Aug 2018 09:39:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478113 - head/x11/kdelibs-kde4/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/x11/kdelibs-kde4/files X-SVN-Commit-Revision: 478113 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: Sun, 26 Aug 2018 09:39:33 -0000 Author: adridg Date: Sun Aug 26 09:39:31 2018 New Revision: 478113 URL: https://svnweb.freebsd.org/changeset/ports/478113 Log: More fixes for kdelibs-kde4 for clang7. Same kind of change as previous commit -- >0 is weird for bools. Reported by: antoine Added: head/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp (contents, props changed) head/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp (contents, props changed) Added: head/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp Sun Aug 26 09:39:31 2018 (r478113) @@ -0,0 +1,11 @@ +--- kio/kfile/kopenwithdialog.cpp.orig 2018-08-26 09:15:08 UTC ++++ kio/kfile/kopenwithdialog.cpp +@@ -713,7 +713,7 @@ void KOpenWithDialog::slotHighlighted(const QString& e + // ### indicate that default value was restored + d->terminal->setChecked(d->curService->terminal()); + QString terminalOptions = d->curService->terminalOptions(); +- d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) > 0)); ++ d->nocloseonexit->setChecked(bool(terminalOptions.contains(QLatin1String("--noclose")))); + d->m_terminaldirty = false; // slotTerminalToggled changed it + } + } Added: head/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp Sun Aug 26 09:39:31 2018 (r478113) @@ -0,0 +1,11 @@ +--- kio/kfile/kpropertiesdialog.cpp.orig 2018-08-26 08:56:17 UTC ++++ kio/kfile/kpropertiesdialog.cpp +@@ -3306,7 +3306,7 @@ void KDesktopPropsPlugin::slotAdvanced() + + if (preferredTerminal == "konsole") + { +- terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) > 0); ++ terminalCloseBool = bool(d->m_terminalOptionStr.contains( "--noclose" )); + w.terminalCloseCheck->setChecked(terminalCloseBool); + d->m_terminalOptionStr.remove( "--noclose"); + }