5 files changed, 7 insertions, 124 deletions
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 5bbc9aca0081..130b61149da2 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,7 +1,5 @@
-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
 DIST plasma-systemmonitor-5.23.5.tar.xz 144876 BLAKE2B f424f44b07807360b59718e7894eb95e9832865431f6a875b3c32309ba2ff078c4a40a27268ec756c5465b0fdff6c2856e3f545cb17c7af6edc92305ac5cb83a SHA512 12e723d79917a2410e174c33f3e63018cabcbfc9f6795f82206075b8573f8aeec47b4708151cddd0a2f2cfed67da4743475f00d46a59c0eee03cdedc15e7a657
-EBUILD plasma-systemmonitor-5.23.4-r1.ebuild 1387 BLAKE2B 2f77e654e2a5a0313bcdb1eb13a3043acfcfa623eab769d9cb3049b60862ae63d777b6bd0a4628d69ae1f0e8e5f76cf249d37d2039e27ea4f8eee9ee1326c4db SHA512 0100ebf82c75adcfd7474db0798e56fbe94def7931362dc46b9131cda01926cb5bd9216aac13ab7b7bb692007d28bf96389544f939c4d978f4c09ae357b6ef37
-EBUILD plasma-systemmonitor-5.23.5.ebuild 1199 BLAKE2B 83f2bc704df40381cd51cdc1f613060af340a3d0ffff0a077e8d2ab8e397d55643b960d366e0132d70963de616330435dd4b660c8e9624202644d53f22f88af1 SHA512 d5daa01c3b88617abcc28059776f1fc34f5b8756985efe74895f5822b232c5399e698746fbc401edf44c1d03089683583487671eeb22cc4b12aec52d40e3a3c1
+DIST plasma-systemmonitor-5.23.90.tar.xz 149696 BLAKE2B 83c71db625b40b05300cd5cb644f8390a749f8f42c6fd0e7f38259bfd5d2dc173ddf2e2a17ad6bd189636e5be710d87262232d113ac2d358fcea93db55d24420 SHA512 9ac18b43f344d25e0da834e9fceff76b5180f193ba26a3613e61c53298ac074de05f68c67f236832924167cd58356f85bae77bc7996dc734cf9876fea6a7a0cf
+EBUILD plasma-systemmonitor-5.23.5.ebuild 1196 BLAKE2B e6dfac9e75365be06ced95b6baffed4736f10b05ed785cfb57d76fecd48dc86fe1e76c70af1bf488714779eb369bcb3a5a4fb4004cfa3f9c1feb8d2f8838de9f SHA512 7a8fec205d65c470f37d298d2c725d666734cfe71736b0cfee40d8f4c43954a269185f5d23fdf52bb8a5e9198d626f92d08862d95ffc2c62955654609bfdf869
+EBUILD plasma-systemmonitor-5.23.90.ebuild 1199 BLAKE2B 96783695175ef7c3c930f796515a413f16af19a02f19a2d433c7599a7e1f27069825287ce77ad8617f73dfb4ef61ab3d581c27bea2f9a0c8deb353fe3821e65f SHA512 1b90add832596d4779c740aa3622f3d08c4c5d2e9f637ec15cd5a5e4ba2873346d12418187a57266dc34f2ea7f76dc8b70cdc5535350800da9718caf22ce176d
 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
deleted file mode 100644
index 9257c8b4250f..000000000000
--- a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 17505ee73146..000000000000
--- a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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.23.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.5.ebuild
index 49d0f0c80879..a1d1f95d807a 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.90.ebuild
index 12fa84166ae2..d39879f4df9c 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.90.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.86.0
+KFMIN=5.90.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -40,9 +40,3 @@ 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
-)