From owner-svn-ports-head@freebsd.org Thu May 21 18:18:11 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C462B2F058C; Thu, 21 May 2020 18:18:11 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49SdCR4htQz45cc; Thu, 21 May 2020 18:18:11 +0000 (UTC) (envelope-from dmgk@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 97EA411739; Thu, 21 May 2020 18:18:11 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04LIIB4m071403; Thu, 21 May 2020 18:18:11 GMT (envelope-from dmgk@FreeBSD.org) Received: (from dmgk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04LIIBrB071400; Thu, 21 May 2020 18:18:11 GMT (envelope-from dmgk@FreeBSD.org) Message-Id: <202005211818.04LIIBrB071400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dmgk set sender to dmgk@FreeBSD.org using -f From: Dmitri Goutnik Date: Thu, 21 May 2020 18:18:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536140 - in head/x11-toolkits/plasma5-kdeplasma-addons: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dmgk X-SVN-Commit-Paths: in head/x11-toolkits/plasma5-kdeplasma-addons: . files X-SVN-Commit-Revision: 536140 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2020 18:18:11 -0000 Author: dmgk Date: Thu May 21 18:18:10 2020 New Revision: 536140 URL: https://svnweb.freebsd.org/changeset/ports/536140 Log: x11-toolkits/plasma5-kdeplasma-addons: Fix "System Load Viewer" plasmoid on FreeBSD - Fix stuck CPU Monitor bar. It was updated only after "cpu/system/iowait" metric was read and because this metric is not available on FreeBSD, the bar was stuck on initial value. - Fix plasmoid tooltip, it was erroring out on reading non-existing "mem/cache/dirty" and "mem/cache/writeback" metrics. PR: 245986 Approved by: tcberner (kde) Added: head/x11-toolkits/plasma5-kdeplasma-addons/files/ head/x11-toolkits/plasma5-kdeplasma-addons/files/patch-applets_systemloadviewer_package_contents_ui_SystemLoadViewer.qml (contents, props changed) Modified: head/x11-toolkits/plasma5-kdeplasma-addons/Makefile Modified: head/x11-toolkits/plasma5-kdeplasma-addons/Makefile ============================================================================== --- head/x11-toolkits/plasma5-kdeplasma-addons/Makefile Thu May 21 16:44:03 2020 (r536139) +++ head/x11-toolkits/plasma5-kdeplasma-addons/Makefile Thu May 21 18:18:10 2020 (r536140) @@ -2,6 +2,7 @@ PORTNAME= kdeplasma-addons DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits kde kde-plasma MAINTAINER= kde@FreeBSD.org Added: head/x11-toolkits/plasma5-kdeplasma-addons/files/patch-applets_systemloadviewer_package_contents_ui_SystemLoadViewer.qml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/plasma5-kdeplasma-addons/files/patch-applets_systemloadviewer_package_contents_ui_SystemLoadViewer.qml Thu May 21 18:18:10 2020 (r536140) @@ -0,0 +1,37 @@ +--- applets/systemloadviewer/package/contents/ui/SystemLoadViewer.qml.orig 2020-03-31 14:08:40 UTC ++++ applets/systemloadviewer/package/contents/ui/SystemLoadViewer.qml +@@ -179,12 +179,15 @@ Item { + onNewData: { + if (sourceName == sysLoad) { + totalCpuLoadProportions[0] = fitCpuLoad(data.value) ++ totalCpuLoadProportionsChanged() + } + else if (sourceName == userLoad) { + totalCpuLoadProportions[1] = fitCpuLoad(data.value) ++ totalCpuLoadProportionsChanged() + } + else if (sourceName == niceLoad) { + totalCpuLoadProportions[2] = fitCpuLoad(data.value) ++ totalCpuLoadProportionsChanged() + } + else if (sourceName == ioWait) { + totalCpuLoadProportions[3] = fitCpuLoad(data.value) +@@ -192,6 +195,7 @@ Item { + } + else if (sourceName == memApplication) { + memoryUsageProportions[0] = fitMemoryUsage(data.value) ++ memoryUsageProportionsChanged() + } + else if (sourceName == memBuffers) { + memoryUsageProportions[1] = fitMemoryUsage(data.value) +@@ -250,8 +254,8 @@ Item { + var swapTotal = swapFree + swapUsed + var swapPart = i18n("Swap: %1/%2 MiB", Math.round(swapUsed), Math.round(swapTotal)) + +- var cacheDirty = parseFloat(dataSource.data[dataSource.cacheDirty].value) / 1024 +- var cacheWriteback = parseFloat(dataSource.data[dataSource.cacheWriteback].value) / 1024 ++ var cacheDirty = parseFloat(dataSource.data[dataSource.cacheDirty] ? dataSource.data[dataSource.cacheDirty].value : 0) / 1024 ++ var cacheWriteback = parseFloat(dataSource.data[dataSource.cacheWriteback] ? dataSource.data[dataSource.cacheWriteback].value : 0) / 1024 + var cachePart = i18n("Cache Dirty, Writeback: %1 MiB, %2 MiB", Math.round(cacheDirty), Math.round(cacheWriteback)) + + if (cpuClockPart === "") {