gentoo resync : 22.12.2021

5 files changed, 119 insertions, 46 deletions

diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index d660ba0296a9..2a91f4f5a382 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-systemmonitor-5.22.5.tar.xz 134624 BLAKE2B 728ce4b89405445cbe385da504fb026d0c310eb06d41a3c4ab5557b8d66d1ed000ba30334363e5a9975e7515595e1cd3dac493a01f1f1bb235df4b9cb3f6ba38 SHA512 4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c
+AUX plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch 1410 BLAKE2B f34f4c40ca7f2a6ac54b17f0d3ba4c3eb7d770920507efcaf10fe6aaf173ebac5cc084bd590c49c7280738c2d9ee3ac4c603ad544f942773e81f7dca7cf3a0d2 SHA512 badf56b143f98a937019bae3d93dcf8b38fa244232ef6472bb00341b6f50dcc6ea8b1aeed8ef7af0fc4094bc6a0c8edd3569b093b83f2c1ad0bac6b3e47e58d0
+AUX plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch 3122 BLAKE2B 722dbd6f63be6ee2a07d73776fc7376e04c75c57529197eb86e056deb14be6f60a7e6eb4dbba931541cfdc83b5740b2cbca42fc1a0a51492968ca2c58b90219c SHA512 6769f767f0c932a710283218cd334da594fc2339c1ba2c2615ac0c886ff25591ca2a18414c39cf9f67126d3ace431dab4d6f456f2933b883110bd1a36cf2ca97
 DIST plasma-systemmonitor-5.23.4.tar.xz 144844 BLAKE2B fc0deda7053096218e28f734e27052439f3d1ad12e3e64b71848ad8711427c47c0c2126ab39cce75973a08ba6c43cc8e2266a1a662730e95d1244ac317c82d06 SHA512 45d90129628cca6d4b2837fee589b2ef93529983a35d6e0890058f9f106fc3abce3b7e9cf76ee8061ade0306885be308c083513208a55d047a92ee4687fd84e5
-EBUILD plasma-systemmonitor-5.22.5.ebuild 1196 BLAKE2B d94938f545224d0910db9102518e0b6b673ef370bcd58f188d97f63d5571e39b8cd6eaa0fc765f29c5e13a5c9d19466d1ce1aef2289e9011e6f611b922c55ca8 SHA512 96bcdcbfabe2618cce4069c36accc7caf18497ba5394d69f2bb263840ac55734ee96eebd6a78b07041954900b6172ac085e60b5f835cbcfc515da5831393cce6
-EBUILD plasma-systemmonitor-5.23.4.ebuild 1199 BLAKE2B a75ac2c72ef185a0fa20ca8c20304cc1094f5ca39d80eaf3dc00b3fd2e29be241b08601389f88333579de7244ef8362c15eaa719ffa2d575bb78b0f769286cfb SHA512 5e5cf5db489112912708da8a8eba570b88579c2b4f77fe2bb4a5af928f8a04e84fcdffdf1169c2d01e43742ecf151b0e5cf02461ecd384b5f068a69d30f4b252
+EBUILD plasma-systemmonitor-5.23.4-r1.ebuild 1387 BLAKE2B 2f77e654e2a5a0313bcdb1eb13a3043acfcfa623eab769d9cb3049b60862ae63d777b6bd0a4628d69ae1f0e8e5f76cf249d37d2039e27ea4f8eee9ee1326c4db SHA512 0100ebf82c75adcfd7474db0798e56fbe94def7931362dc46b9131cda01926cb5bd9216aac13ab7b7bb692007d28bf96389544f939c4d978f4c09ae357b6ef37
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch
new file mode 100644
index 000000000000..9257c8b4250f
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch
@@ -0,0 +1,36 @@
+From b18f98fee76104d5be6b871dea330be32863ad27 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 23 Nov 2021 10:52:11 +0100
+Subject: [PATCH] Add comma separated filtering to ApplicationsTableView
+
+Instead of using ProcessSortFilterModel we can implement in
+the callback of the KSortFilterProxyModel.
+
+
+(cherry picked from commit 364bada0ad5befd560758bad11190b1fd7043b34)
+---
+ .../contents/ui/ApplicationsTableView.qml                 | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+index 3f3ed4f..1f2dd36 100644
+--- a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
++++ b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+@@ -96,6 +96,14 @@ Table.BaseTableView {
+             }
+             return true
+         }
++        filterRowCallback: function(row, parent) {
++            if (filterString.length == 0) {
++                return true
++            }
++            const name = sourceModel.data(sourceModel.index(row, filterKeyColumn, parent), filterRole).toLowerCase()
++            const parts = filterString.toLowerCase().split(",").map(s => s.trim()).filter(s => s.length > 0)
++            return parts.some(part => name.includes(part))
++        }
+ 
+         sortRole: "Value"
+     }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch
new file mode 100644
index 000000000000..17505ee73146
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch
@@ -0,0 +1,73 @@
+From 50f6378144ed244b9c1cd3e325ecbe45dd7544d4 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Mon, 22 Nov 2021 12:15:14 +0100
+Subject: [PATCH] ApplicationsTable: Remove unneeded ProcessSortFilterModel
+
+ProcessSortFilterModel handles filtering pids and to which user a process
+belongs over a normal QSortFilterProxyModel. In doing so it also
+sets the filterKeyColumn to nameColumn in findColumns(). Note that the name
+of the name columns of the process and application table is different
+("name" and "appName"), so the filterKeyColumn is also set by ApplicationTableView.
+However this is racey depending on when the binding is evaluated.
+Since we don't need the extra features of the ProcessSortFilterModel we can use
+the existing SortFilterProxyModel in charge of filtering columns (something that
+the ProcessSortFilterModel also did) to also handle the row filtering.
+BUG:445544
+FIXED-IN:5.23.4
+
+
+(cherry picked from commit a96bc99a3650c3bf2e48ab1287dc779dbba87c51)
+---
+ .../contents/ui/ApplicationsTableView.qml         | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+index 38915b3..3f3ed4f 100644
+--- a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
++++ b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+@@ -32,7 +32,7 @@ Table.BaseTableView {
+     property alias columnDisplay: displayModel.columnDisplay
+     property alias sourceModel: appModel
+ 
+-    property alias filterString: filterProxy.filterString
++    property alias filterString: sortColumnFilter.filterString
+ 
+     property var selectedApplications: {
+         var result = []
+@@ -83,8 +83,9 @@ Table.BaseTableView {
+     model: KItemModels.KSortFilterProxyModel {
+         id: sortColumnFilter
+ 
+-        sourceModel: filterProxy
+-
++        sourceModel: cacheModel
++        filterKeyColumn: appModel.nameColumn
++        filterCaseSensitivity: Qt.CaseInsensitive
+         filterColumnCallback: function(column, parent) {
+             // Note: This assumes displayModel column == appModel column
+             // This may not always hold, but we get incorrect results if we try to
+@@ -99,13 +100,6 @@ Table.BaseTableView {
+         sortRole: "Value"
+     }
+ 
+-    Table.ProcessSortFilterModel {
+-        id: filterProxy
+-        sourceModel: cacheModel
+-        filterKeyColumn: appModel.nameColumn
+-        filterCaseSensitivity: Qt.CaseInsensitive
+-    }
+-
+     Table.ComponentCacheProxyModel {
+         id: cacheModel
+         sourceModel: displayModel
+@@ -184,7 +178,6 @@ Table.BaseTableView {
+             Table.FirstCellDelegate {
+                 iconName: {
+                     var index = sortColumnFilter.mapToSource(sortColumnFilter.index(model.row, 0));
+-                    index = filterProxy.mapToSource(filterProxy.index(index.row, 0));
+                     index = appModel.index(index.row, appModel.iconColumn)
+                     return appModel.data(index)
+                     return ""
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild
index daf638b076a2..12fa84166ae2 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.82.0
+KFMIN=5.86.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -40,3 +40,9 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kquickcharts-${KFMIN}:5
 	>=kde-plasma/ksystemstats-${PVCUT}:5
 "
+
+PATCHES=(
+	# 5.23 branch, KDE-bug 445544
+	"${FILESDIR}"/${P}-applications-remove-unneeded-ProcessSortFilterModel.patch
+	"${FILESDIR}"/${P}-applications-add-comma-separated-filtering.patch
+)
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4.ebuild
deleted file mode 100644
index 6960f0e9446b..000000000000
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.86.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Monitor system sensors, process information and other system resources"
-HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/ksystemstats-${PVCUT}:5
-"