5 files changed, 87 insertions, 36 deletions
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index a194047c9fb5..2be7e2a6ac18 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,6 @@
-AUX libksysguard-5.22.5-no-detailed-mem-message.patch 1100 BLAKE2B ca0d79c17109b9a24258c48a59efc3a8f66b28bcfd15ec1168f6276ea9568530abbfe442db7fdd9bd524409fac5cad951de44778df382e48b731d3d33fd68479 SHA512 20fd323fd34c6f46d4d3116c85edbeb8feee048890c5c78d1862891937962d5b04ec2e1d1429826f4f3999d6413d09040307322ae16284fb8c8f31e301290e65
 AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b
-DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
+AUX libksysguard-5.23.4-fix-segfault.patch 2863 BLAKE2B f29737e9bea3c9ab75e3b7e349577eb368543c18e2f54a999f1cd67a9ae6d81e438dab5567635aa665f8c53087cd03e2a1345fbb0e58825ffd638c691ab26363 SHA512 681eb69991d14c063e070334bb8ea5b14e7efa1b4eef4e823581f575f19d121ee9a65b0d54e810b772c65d418410fc85093daf6fcc1c10a816ff19dad28de518
 DIST libksysguard-5.23.4.tar.xz 769308 BLAKE2B 05238556867dc054d4c9bd5eadf6c16db6ffdbb481c93a3efc4e83059da6eea73233723ba273a9e5702a2f00a669f8fd0ed54c4a44bdb8797bbc3bb453a71a84 SHA512 8a6c3f06e5f502e9d45fd3ff58fb1da41bd1581164c5054ce79cf2e34c2ece6df22c3b0ab6d33d74d37a97c36cfa076b3a2e459504ea3d3e48d12058aae48648
-EBUILD libksysguard-5.22.5.ebuild 1795 BLAKE2B b750fa9d5ed0e13f8f5959db8a36650ae94ab73a9f6b17640f74072481b9a7753bb16684508b17b74ad236639f66fad5e2e6636a464a872c84402c2903d61243 SHA512 5dba3b166d5e56bd0adea34f7407312abeab0d051e20aacd1cc0cdee7e5017d2133b5d7b3098dbb132b08d6b9fe793a4e1e78d1d53c6d8cfc9fb25a671179145
-EBUILD libksysguard-5.23.4.ebuild 1830 BLAKE2B 822bafb786ed86f9c829416e52924d1439b5bb105505f0a08cf35e2e1a51bdd0194246dede9b7f3d90298af09af8c8ca10a5945cd0c61c5fd205cd9f4801ede3 SHA512 04a9bfc170ad79dd428046cdb115bc4fee71cbf6cf45bd487dbeaef8f793dfa626d895fb06e0c6ff5457b9c845b0a33e51ec93c5b64c5023ff68acc27fc9e21c
+EBUILD libksysguard-5.23.4-r1.ebuild 1898 BLAKE2B e51a96e3588e4c63376d0d367c4a78fd21d04bc383705da95a50cef1a243c3e53e6f8c3562ec0d380312355c60e420216ee0fb447116f2d4c5badd5cb508f37a SHA512 17c84f9cd86554904f0923c0363a5f361294293608dd70fbb751f8da39d9c501c266892c33fd2e7698eab0c7cb57cdf1eb6197399daaac8a90c189f646d58d1f
+EBUILD libksysguard-5.23.4.ebuild 1827 BLAKE2B 1a742ce353de1c7a94c2ae52b8acccc41cfbbeb628619b167c4cd668c86a72d956875293722e61bbe00a79c00d80447c02a6f7b14f266a6046d16a6492b56c28 SHA512 190c474773b0b34d44a12081a3d95ef5681d868a42fa792eaa4f76427b401a67b5cb4df9949a5bfdc49b28d9aa711311044d334d152646b2e4157aa308e9fb9c
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
deleted file mode 100644
index 352cad76b765..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a81b823c8e169ee5a4212070a9cc77dad27aa7b6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 7 Sep 2021 16:08:30 +0200
-Subject: [PATCH] Gentooify message about QtWebEngineWidgets
-
-Translations can not be provided for this.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 2e95624..c69a123 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -243,7 +243,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
-     mScriptingHtmlDialog->webView()->load(fileName);
- #else
-     QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"),
--            i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution."));
-+            QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
- #endif
- }
- #if WEBENGINE_SCRIPTING_ENABLED
--- 
-2.33.0
-
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
new file mode 100644
index 000000000000..f37fbf60bf81
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
@@ -0,0 +1,76 @@
+From 311faef0ef0e5f60eebed2a5a00c43f5cb60aab1 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 7 Dec 2021 22:23:17 +0100
+Subject: [PATCH] Handle process parent changes in ProcessDataModel
+
+When the PPID of a process changes, it moves around in the model, changing the
+layout. This needs to be announced properly, otherwise users of the model get
+confused, leading to weird behaviour and crashes.
+
+The added code is pretty much a direct copy from ProcessModel.
+
+BUG: 446534
+
+
+(cherry picked from commit a0d70929a1b5e38bd8bf61e1895321124acf03a7)
+---
+ processcore/process_data_model.cpp | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/processcore/process_data_model.cpp b/processcore/process_data_model.cpp
+index 172ce7f..f776372 100644
+--- a/processcore/process_data_model.cpp
++++ b/processcore/process_data_model.cpp
+@@ -24,6 +24,8 @@ public:
+     Private(ProcessDataModel *q);
+     void beginInsertRow(KSysGuard::Process *parent);
+     void endInsertRow();
++    void beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent);
++    void endMoveProcess();
+     void beginRemoveRow(KSysGuard::Process *process);
+     void endRemoveRow();
+ 
+@@ -65,6 +67,12 @@ ProcessDataModel::Private::Private(ProcessDataModel *_q)
+     connect(m_processes.get(), &KSysGuard::Processes::endAddProcess, q, [this]() {
+         endInsertRow();
+     });
++    connect(m_processes.get(), &KSysGuard::Processes::beginMoveProcess, q, [this](KSysGuard::Process *process, KSysGuard::Process *new_parent) {
++        beginMoveProcess(process, new_parent);
++    });
++    connect(m_processes.get(), &KSysGuard::Processes::endMoveProcess, q, [this]() {
++        endMoveProcess();
++    });
+     connect(m_processes.get(), &KSysGuard::Processes::beginRemoveProcess, q, [this](KSysGuard::Process *process) {
+         beginRemoveRow(process);
+     });
+@@ -335,6 +343,27 @@ void ProcessDataModel::Private::endRemoveRow()
+     q->endRemoveRows();
+ }
+ 
++void ProcessDataModel::Private::beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent)
++{
++    if (m_flatList)
++        return; // We don't need to move processes when in simple mode
++
++    int current_row = process->parent()->children().indexOf(process);
++    Q_ASSERT(current_row != -1);
++    int new_row = new_parent->children().count();
++    QModelIndex sourceParent = getQModelIndex(process->parent(), 0);
++    QModelIndex destinationParent = getQModelIndex(new_parent, 0);
++    q->beginMoveRows(sourceParent, current_row, current_row, destinationParent, new_row);
++}
++
++void ProcessDataModel::Private::endMoveProcess()
++{
++    if (m_flatList)
++        return; // We don't need to move processes when in simple mode
++
++    q->endMoveRows();
++}
++
+ void ProcessDataModel::Private::update()
+ {
+     Processes::UpdateFlags flags;
+-- 
+GitLab
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
index 75b9c0ee7c19..86139aca748a 100644
--- a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.86.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="webengine X"
 
 COMMON_DEPEND="
@@ -37,6 +37,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	net-libs/libpcap
+	sys-apps/lm-sensors:=
 	sys-libs/libcap
 	sys-libs/zlib
 	webengine? (
@@ -58,7 +59,10 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/plasma-workspace-5.18.80:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-no-detailed-mem-message.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream
+	"${FILESDIR}/${P}-fix-segfault.patch" # KDE-bug 446534
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
index 1a8b55594efa..413701ff90e8 100644
--- a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="webengine X"
 
 COMMON_DEPEND="