From owner-svn-ports-all@freebsd.org Thu Aug 30 10:09:42 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 14D9B109AC9C; Thu, 30 Aug 2018 10:09:42 +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 B02647A4E8; Thu, 30 Aug 2018 10:09:41 +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 8BA4F2BA3; Thu, 30 Aug 2018 10:09:41 +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 w7UA9fMP033209; Thu, 30 Aug 2018 10:09:41 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7UA9fVK033207; Thu, 30 Aug 2018 10:09:41 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201808301009.w7UA9fVK033207@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 10:09:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478440 - head/x11/kde-workspace-kde4/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/x11/kde-workspace-kde4/files X-SVN-Commit-Revision: 478440 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 10:09:42 -0000 Author: adridg Date: Thu Aug 30 10:09:40 2018 New Revision: 478440 URL: https://svnweb.freebsd.org/changeset/ports/478440 Log: Fix build with clang7. PR: 230936 Reported by: jbeich Added: head/x11/kde-workspace-kde4/files/patch-khotkeys_libkhotkeysprivate_windows__helper_window__selection__rules.cpp (contents, props changed) head/x11/kde-workspace-kde4/files/patch-libs_taskmanager_task.cpp (contents, props changed) head/x11/kde-workspace-kde4/files/patch-plasma_generic_dataengines_weather_ions_bbcukmet_ion__bbcukmet.cpp (contents, props changed) Added: head/x11/kde-workspace-kde4/files/patch-khotkeys_libkhotkeysprivate_windows__helper_window__selection__rules.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde-workspace-kde4/files/patch-khotkeys_libkhotkeysprivate_windows__helper_window__selection__rules.cpp Thu Aug 30 10:09:40 2018 (r478440) @@ -0,0 +1,20 @@ +--- khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp.orig 2018-08-30 10:04:38 UTC ++++ khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp +@@ -91,7 +91,7 @@ bool Windowdef_simple::is_substr_match( + case NOT_IMPORTANT : + return true; + case CONTAINS : +- return str1_P.contains( str2_P ) > 0; ++ return bool(str1_P.contains( str2_P )); + case IS : + return str1_P == str2_P; + case REGEXP : +@@ -100,7 +100,7 @@ bool Windowdef_simple::is_substr_match( + return rg.indexIn( str1_P ) >= 0; + } + case CONTAINS_NOT : +- return str1_P.contains( str2_P ) == 0; ++ return !str1_P.contains( str2_P ); + case IS_NOT : + return str1_P != str2_P; + case REGEXP_NOT : Added: head/x11/kde-workspace-kde4/files/patch-libs_taskmanager_task.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde-workspace-kde4/files/patch-libs_taskmanager_task.cpp Thu Aug 30 10:09:40 2018 (r478440) @@ -0,0 +1,15 @@ +--- libs/taskmanager/task.cpp.orig 2018-08-30 10:05:33 UTC ++++ libs/taskmanager/task.cpp +@@ -478,10 +478,10 @@ bool Task::idMatch(const QString& id1, c + if (id1.isEmpty() || id2.isEmpty()) + return false; + +- if (id1.contains(id2) > 0) ++ if (id1.contains(id2)) + return true; + +- if (id2.contains(id1) > 0) ++ if (id2.contains(id1)) + return true; + + return false; Added: head/x11/kde-workspace-kde4/files/patch-plasma_generic_dataengines_weather_ions_bbcukmet_ion__bbcukmet.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde-workspace-kde4/files/patch-plasma_generic_dataengines_weather_ions_bbcukmet_ion__bbcukmet.cpp Thu Aug 30 10:09:40 2018 (r478440) @@ -0,0 +1,25 @@ +--- plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp.orig 2018-08-30 10:05:25 UTC ++++ plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp +@@ -312,11 +312,11 @@ void UKMETIon::readSearchHTMLData(const + + while (!stream.atEnd()) { + line = stream.readLine(); +- if (line.contains("

") > 0) { ++ if (line.contains("

")) { + flag = 1; + } + +- if (line.contains("There are no forecasts matching") > 0) { ++ if (line.contains("There are no forecasts matching")) { + break; + } + +@@ -342,7 +342,7 @@ void UKMETIon::readSearchHTMLData(const + } + } + +- if (line.contains("

") > 0) { ++ if (line.contains("
")) { + flag = 0; + } + }