* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/, kde-plasma/libksysguard/files/
@ 2021-01-24 19:44 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-01-24 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 0223c2aedbe34636154819b9779514658ed1e150
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 11:48:08 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:42:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0223c2ae
kde-plasma/libksysguard: drop 5.19.5*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/libksysguard/Manifest | 1 -
.../files/libksysguard-5.18.90-unused-dep.patch | 92 ----------------------
kde-plasma/libksysguard/libksysguard-5.19.5.ebuild | 71 -----------------
3 files changed, 164 deletions(-)
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b1ee03e5be4..93e6d525ead 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1 @@
-DIST libksysguard-5.19.5.tar.xz 674900 BLAKE2B 88408494360921bff732ba535a932b2a17d8faba9a0cd231754dda6116ce52d8cb6ed32f89f05e16091b54a378d3d50e5e46feff1e27b46260f3803ca78b9855 SHA512 8e723eff1e50195005a91dd558df0ddce956c33478c00e177f1eae4d9997ea8332d86bb8fae1eb2d18bfe3bdceefa31fe4211dfcf4bb1c463d347ced33e75348
DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
deleted file mode 100644
index 903b7b8bcf2..00000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From fa06754147850ba06659f21e57cd7a724ecf8c49 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-Date: Sat, 23 May 2020 18:26:12 +0200
-Subject: [PATCH] remove unnecessary dependency
-
----
- CMakeLists.txt | 13 +------------
- signalplotter/CMakeLists.txt | 1 -
- signalplotter/ksignalplotter.cpp | 2 +-
- signalplotter/ksignalplotter_p.h | 2 ++
- 4 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b12ead7..063cb05 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,14 +46,6 @@ set_package_properties(Qt5WebChannel PROPERTIES
-
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package Declarative NewStuff)
-
--find_package(KF5 OPTIONAL_COMPONENTS Plasma)
--set_package_properties(KF5Plasma PROPERTIES
-- URL "https://cgit.kde.org/plasma-framework.git/"
-- DESCRIPTION "The library of the plasma project"
-- TYPE OPTIONAL
-- PURPOSE "Used by signalplotter to use Plasma themes"
-- )
--
- find_package(ZLIB REQUIRED)
- set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
- URL "http://www.zlib.net"
-@@ -113,10 +105,7 @@ add_subdirectory( processcore )
- add_subdirectory( processui )
- add_subdirectory( sensors )
- add_subdirectory( faces )
--
--if (KF5Plasma_FOUND)
-- add_subdirectory( signalplotter )
--endif()
-+add_subdirectory( signalplotter )
- add_subdirectory( ksgrd )
-
- if(BUILD_TESTING)
-diff --git a/signalplotter/CMakeLists.txt b/signalplotter/CMakeLists.txt
-index fd11f01..231fcf7 100644
---- a/signalplotter/CMakeLists.txt
-+++ b/signalplotter/CMakeLists.txt
-@@ -16,7 +16,6 @@ target_link_libraries(ksignalplotter
- KF5::IconThemes
- PRIVATE
- KSysGuard::ProcessCore
-- KF5::Plasma
- )
-
- set_target_properties(ksignalplotter
-diff --git a/signalplotter/ksignalplotter.cpp b/signalplotter/ksignalplotter.cpp
-index 4e6c278..df7c705 100644
---- a/signalplotter/ksignalplotter.cpp
-+++ b/signalplotter/ksignalplotter.cpp
-@@ -42,7 +42,6 @@
- #ifdef GRAPHICS_SIGNAL_PLOTTER
- #include <QGraphicsSceneResizeEvent>
- #include <QStyleOptionGraphicsItem>
--#include <Plasma/Theme>
- #endif
-
- #include <klocalizedstring.h>
-@@ -52,6 +51,7 @@
-
- #ifdef SVG_SUPPORT
- #include <Plasma/Svg>
-+#include <Plasma/Theme>
- #endif
-
-
-diff --git a/signalplotter/ksignalplotter_p.h b/signalplotter/ksignalplotter_p.h
-index 81912f5..082f97c 100644
---- a/signalplotter/ksignalplotter_p.h
-+++ b/signalplotter/ksignalplotter_p.h
-@@ -24,7 +24,9 @@
- //#define USE_QIMAGE
-
- // SVG support causes it to crash at the moment :(
-+// (when re-enabling this remember to also link against plasma-framework)
- //#define SVG_SUPPORT
-+
- // Use a separate child widget to draw the graph in
- #ifndef KSYSGUARD_KSIGNALPLOTTER_P_H
- #define KSYSGUARD_KSIGNALPLOTTER_P_H
---
-2.26.2
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
deleted file mode 100644
index cf0bfe42b84..00000000000
--- a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="webengine X"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- sys-libs/zlib
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libXres
- )
-"
-DEPEND="${RDEPEND}
- !<kde-plasma/plasma-workspace-5.18.80:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch"
- "${FILESDIR}/${PN}-5.18.90-unused-dep.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package webengine Qt5WebChannel)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- LC_NUMERIC="C" ecm_src_test # bug 695514
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/, kde-plasma/libksysguard/files/
@ 2021-02-17 22:13 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-02-17 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 764915834d64bd9ba4cd9c49c94d7d54207e159f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 21:44:50 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 22:13:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76491583
kde-plasma/libksysguard: Add method CGroupDataModel::isAvailable
Backport upstream commit 76a3570ab2f9fab98aa6ccc9ceafbbc29323db06 to fix
a runtime crash happening without systemd.
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=433013
Reported-by: jospezial <jospezial <AT> gmx.de>
Closes: https://bugs.gentoo.org/766755
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...libksysguard-5.21.0-fix-non-systemd-crash.patch | 96 ++++++++++++++++++++++
.../libksysguard/libksysguard-5.21.0-r1.ebuild | 72 ++++++++++++++++
2 files changed, 168 insertions(+)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.21.0-fix-non-systemd-crash.patch b/kde-plasma/libksysguard/files/libksysguard-5.21.0-fix-non-systemd-crash.patch
new file mode 100644
index 00000000000..ec7c57e133a
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.21.0-fix-non-systemd-crash.patch
@@ -0,0 +1,96 @@
+From 76a3570ab2f9fab98aa6ccc9ceafbbc29323db06 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 4 Feb 2021 10:47:43 +0000
+Subject: [PATCH] Add method CGroupDataModel::isAvailable
+
+This returns true if the root is pointing to a valid path. The idea
+being that non-systemd systems won't have applications scoped correctly,
+nor a relevant user slice.
+
+By communicating this we can dislpay the entry as not working in the UI.
+
+
+(cherry picked from commit 6d42960456f145d178579a1debb726bd0c7dcee6)
+---
+ processcore/cgroup_data_model.cpp | 21 ++++++++++++++++++++-
+ processcore/cgroup_data_model.h | 5 +++++
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/processcore/cgroup_data_model.cpp b/processcore/cgroup_data_model.cpp
+index 46a36c3..4278a2c 100644
+--- a/processcore/cgroup_data_model.cpp
++++ b/processcore/cgroup_data_model.cpp
+@@ -48,6 +48,7 @@ public:
+ QHash<QString, KSysGuard::ProcessAttribute* > m_availableAttributes;
+ QVector<KSysGuard::ProcessAttribute* > m_enabledAttributes;
+
++ bool m_available = false;
+ QString m_root;
+ QScopedPointer<CGroup> m_rootGroup;
+
+@@ -367,9 +368,22 @@ void CGroupDataModel::setRoot(const QString &root)
+ return;
+ }
+ d->m_root = root;
+- d->m_rootGroup.reset(new CGroup(root));
+ emit rootChanged();
+ QMetaObject::invokeMethod(this, [this] {update();}, Qt::QueuedConnection);
++
++ const QString path = CGroup::cgroupSysBasePath() + root;
++ bool available = QFile::exists(path);
++
++ if (available) {
++ d->m_rootGroup.reset(new CGroup(root));
++ } else {
++ d->m_rootGroup.reset();
++ }
++
++ if (available != d->m_available) {
++ d->m_available = available;
++ emit availableChanged();
++ }
+ }
+
+ void CGroupDataModel::update()
+@@ -443,6 +457,11 @@ void CGroupDataModel::update(CGroup *node)
+ }
+ }
+
++bool CGroupDataModel::isAvailable() const
++{
++ return d->m_available;
++}
++
+ QVector<Process*> CGroupDataModelPrivate::processesFor(CGroup *app)
+ {
+ if (m_processMap.contains(app)) {
+diff --git a/processcore/cgroup_data_model.h b/processcore/cgroup_data_model.h
+index 5ce58aa..1f7d28d 100644
+--- a/processcore/cgroup_data_model.h
++++ b/processcore/cgroup_data_model.h
+@@ -59,6 +59,8 @@ class Q_DECL_EXPORT CGroupDataModel : public QAbstractItemModel
+ */
+ Q_PROPERTY(QString setRoot READ root WRITE setRoot NOTIFY rootChanged)
+
++ Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged)
++
+ public:
+ CGroupDataModel(QObject *parent = nullptr);
+ CGroupDataModel(const QString &root, QObject *parent = nullptr);
+@@ -114,10 +116,13 @@ public:
+ */
+ void update();
+
++ bool isAvailable() const;
++
+ Q_SIGNALS:
+ void enabledAttributesChanged();
+ void enabledChanged();
+ void rootChanged();
++ void availableChanged();
+
+ protected:
+ virtual bool filterAcceptsCGroup(const QString &id);
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.0-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.0-r1.ebuild
new file mode 100644
index 00000000000..91254d1119c
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.21.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="webengine X"
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ sys-libs/zlib
+ webengine? (
+ >=dev-qt/qtwebchannel-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libXres
+ )
+"
+DEPEND="${RDEPEND}
+ !<kde-plasma/plasma-workspace-5.18.80:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" # downstream info
+ "${FILESDIR}/${P}-fix-non-systemd-crash.patch" # bug 766755
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package webengine Qt5WebChannel)
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ LC_NUMERIC="C" ecm_src_test # bug 695514
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/, kde-plasma/libksysguard/files/
@ 2021-12-15 9:38 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-12-15 9:38 UTC (permalink / raw
To: gentoo-commits
commit: 88d68008b9979f7235ed225b70030a26e07ffcaf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 09:06:15 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 09:38:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d68008
kde-plasma/libksysguard: Fix segfault in process list tree view mode
Reported-by: Eric F. Garioud <eric-f.garioud <AT> wanadoo.fr>
Bug: https://bugs.gentoo.org/446534
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libksysguard-5.23.4-fix-segfault.patch | 76 +++++++++++++++++++++
.../libksysguard/libksysguard-5.23.4-r1.ebuild | 79 ++++++++++++++++++++++
2 files changed, 155 insertions(+)
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.23.4-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
new file mode 100644
index 000000000000..a2127dcf2c23
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.86.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="webengine X"
+
+COMMON_DEPEND="
+ dev-libs/libnl:3
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ net-libs/libpcap
+ sys-apps/lm-sensors:=
+ sys-libs/libcap
+ sys-libs/zlib
+ webengine? (
+ >=dev-qt/qtwebchannel-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libXres
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-plasma/ksysguard-5.21.90:5
+ !<kde-plasma/plasma-workspace-5.18.80:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream
+ "${FILESDIR}/${P}-fix-segfault.patch" # KDE-bug 446534
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package webengine Qt5WebChannel)
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ LC_NUMERIC="C" ecm_src_test # bug 695514
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/, kde-plasma/libksysguard/files/
@ 2022-01-25 9:49 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-01-25 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 0ad0b4a9b7c57bce114a60a7d67f2ca7d86dbe5c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 19 08:41:26 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 09:43:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad0b4a9
kde-plasma/libksysguard: drop 5.23.4*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/libksysguard/Manifest | 1 -
.../files/libksysguard-5.23.4-fix-segfault.patch | 76 ---------------------
.../libksysguard/libksysguard-5.23.4-r1.ebuild | 79 ----------------------
kde-plasma/libksysguard/libksysguard-5.23.4.ebuild | 76 ---------------------
4 files changed, 232 deletions(-)
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 8b0c89764af8..cde9a652d115 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,3 +1,2 @@
-DIST libksysguard-5.23.4.tar.xz 769308 BLAKE2B 05238556867dc054d4c9bd5eadf6c16db6ffdbb481c93a3efc4e83059da6eea73233723ba273a9e5702a2f00a669f8fd0ed54c4a44bdb8797bbc3bb453a71a84 SHA512 8a6c3f06e5f502e9d45fd3ff58fb1da41bd1581164c5054ce79cf2e34c2ece6df22c3b0ab6d33d74d37a97c36cfa076b3a2e459504ea3d3e48d12058aae48648
DIST libksysguard-5.23.5.tar.xz 769012 BLAKE2B 6e819d8552f1cbfbc76cda3b29a69d6605716d26bc7a4b69f48aef6f7510e52d606ae7e7b3bfadd7383888b6e7740c5ba41407975a1570f4f2bc653290bf0a57 SHA512 11b1bae5ec8a0897086556f7f93c8dc8899b7ff7737f738366b50c3fe4b1590e486109e2eb71e76c3321fe3b2baa59fe8031219d2c8c53bb37d925df56c72b3a
DIST libksysguard-5.23.90.tar.xz 767540 BLAKE2B aad6d2a262e34908eae4b69c7543f4498ad82753cbb0a494958d5589278939a9d6f14a2152d4e0939567eb5f39fa45a67d889c2878c9adc42c0ba9d047704fd7 SHA512 8bd31b08a120cf92b1bdbf32327534f8afd391820310fbb2f6c54cd7a609f93902c997c6f32acce7b9c350e96f89cd7e01aedfea0c408b58a0a1a0ea52ee2977
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
deleted file mode 100644
index f37fbf60bf81..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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.23.4-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
deleted file mode 100644
index 86139aca748a..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.86.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="webengine X"
-
-COMMON_DEPEND="
- dev-libs/libnl:3
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- net-libs/libpcap
- sys-apps/lm-sensors:=
- sys-libs/libcap
- sys-libs/zlib
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libXres
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/ksysguard-5.21.90:5
- !<kde-plasma/plasma-workspace-5.18.80:5
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream
- "${FILESDIR}/${P}-fix-segfault.patch" # KDE-bug 446534
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package webengine Qt5WebChannel)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
deleted file mode 100644
index 413701ff90e8..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.86.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="webengine X"
-
-COMMON_DEPEND="
- dev-libs/libnl:3
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- net-libs/libpcap
- sys-apps/lm-sensors:=
- sys-libs/libcap
- sys-libs/zlib
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libXres
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/ksysguard-5.21.90:5
- !<kde-plasma/plasma-workspace-5.18.80:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package webengine Qt5WebChannel)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- LC_NUMERIC="C" ecm_src_test # bug 695514
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/, kde-plasma/libksysguard/files/
@ 2023-01-15 13:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-01-15 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 6ecbad44e5fd2a653bcb5e0f43c6411d99e22da9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 12:22:48 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 13:04:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecbad44
kde-plasma/libksysguard: Drop IUSE X
kde-frameworks/kwindowsystem[X] is unconditional through use of KX11Extras
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libksysguard-5.26.0-with_x11.patch | 110 ---------------------
...5.26.5.ebuild => libksysguard-5.26.5-r1.ebuild} | 19 ++--
2 files changed, 7 insertions(+), 122 deletions(-)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch b/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
deleted file mode 100644
index d27504413384..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From c389fbdaff34e35b0cd5de32b52e818714e13d40 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 1 Aug 2022 16:53:42 +0200
-Subject: [PATCH] Add CMake option to build WITH_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-- Cleanup HAVE_* definitions a bit
-- Clarify X11 PURPOSE a bit
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 44 ++++++++++++++++++++++------------------
- processui/CMakeLists.txt | 4 ++--
- 2 files changed, 26 insertions(+), 22 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55938c4..5d4e085 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,25 +65,31 @@ ecm_setup_version(${PROJECT_VERSION}
- SOVERSION 9
- )
-
--find_package(X11)
--set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-- URL "https://www.x.org"
-- TYPE OPTIONAL
-- PURPOSE "Required for building the X11 based workspace"
-- )
--if(X11_FOUND)
-- if (QT_MAJOR_VERSION STREQUAL "5")
-- find_package(Qt5X11Extras REQUIRED)
-- elseif (QT_MAJOR_VERSION STREQUAL "6")
-- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-- endif()
-- set(HAVE_X11 1)
-- find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
-- find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
--
-- if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
-- set(X11_XRes_FOUND TRUE)
-+option(WITH_X11 "Build with X11 support." ON)
-+if(WITH_X11)
-+ find_package(X11)
-+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+ URL "https://www.x.org"
-+ TYPE OPTIONAL
-+ PURPOSE "Required for building Process UI with X11 support"
-+ )
-+ if(X11_FOUND)
-+ if (QT_MAJOR_VERSION STREQUAL "5")
-+ find_package(Qt5X11Extras REQUIRED)
-+ elseif (QT_MAJOR_VERSION STREQUAL "6")
-+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-+ endif()
-+ set(HAVE_X11 1)
-+ find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
-+ find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
-+
-+ if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
-+ set(HAVE_XRES 1)
-+ endif()
- endif()
-+else()
-+ set(HAVE_X11 0)
-+ set(HAVE_XRES 0)
- endif()
-
- set(WEBENGINE_SCRIPTING_ENABLED FALSE)
-@@ -122,8 +128,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- PURPOSE "Used for reading hardware sensors")
- endif()
-
--set(HAVE_X11 ${X11_FOUND})
--set(HAVE_XRES ${X11_XRes_FOUND})
- configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
-
- option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
-diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
-index 2932733..c9bd800 100644
---- a/processui/CMakeLists.txt
-+++ b/processui/CMakeLists.txt
-@@ -30,7 +30,7 @@ ki18n_wrap_ui( processui_LIB_SRCS
- add_library(processui ${processui_LIB_SRCS})
- add_library(KSysGuard::ProcessUi ALIAS processui)
-
--if(X11_XRes_FOUND)
-+if(HAVE_XRES)
- target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES})
- include_directories(${X11_XRes_INCLUDE_PATH})
- endif()
-@@ -59,7 +59,7 @@ target_include_directories(processui
- "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
- "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>"
- )
--if(X11_FOUND)
-+if(HAVE_X11)
- if (QT_MAJOR_VERSION STREQUAL "5")
- target_link_libraries(processui PRIVATE Qt::X11Extras KF5::WindowSystem)
- else()
---
-2.35.1
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
similarity index 83%
rename from kde-plasma/libksysguard/libksysguard-5.26.5.ebuild
rename to kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
index d9c38f3b05fc..43bb682c183b 100644
--- a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
@@ -15,8 +15,9 @@ DESCRIPTION="Task management and system monitoring library"
LICENSE="LGPL-2+"
SLOT="5/9"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="webengine X"
+IUSE="webengine"
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
COMMON_DEPEND="
dev-libs/libnl:3
>=dev-qt/qtdbus-${QTMIN}:5
@@ -24,6 +25,7 @@ COMMON_DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kauth-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5[qml]
@@ -34,24 +36,21 @@ COMMON_DEPEND="
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
net-libs/libpcap
sys-apps/lm-sensors:=
sys-libs/libcap
sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXres
webengine? (
>=dev-qt/qtwebchannel-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5
)
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libXres
- )
"
DEPEND="${COMMON_DEPEND}
>=kde-frameworks/kiconthemes-${KFMIN}:5
- X? ( x11-base/xorg-proto )
+ x11-base/xorg-proto
"
RDEPEND="${COMMON_DEPEND}
!<kde-plasma/ksysguard-5.21.90:5
@@ -60,16 +59,12 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
# downstream patch
"${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
- # pending upstream:
- # https://invent.kde.org/plasma/libksysguard/-/merge_requests/238
- "${FILESDIR}/${PN}-5.26.0-with_x11.patch"
)
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package webengine Qt5WebChannel)
$(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DWITH_X11=$(usex X)
)
ecm_src_configure
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/, kde-plasma/libksysguard/files/
@ 2023-08-14 13:56 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-08-14 13:56 UTC (permalink / raw
To: gentoo-commits
commit: 04932d9fd380df7153152c2041b02a9f4b8ba2fc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 13:53:41 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 13:56:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04932d9f
kde-plasma/libksysguard: sensors: Correctly handle the return value
...of QCollator::compare
Fixes: sensor list in system monitor are changed every time and not
correct with C locale
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=461070
Bug: https://bugs.gentoo.org/911788
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....27.7-sensors-correctly-handle-return-val.patch | 36 ++++++++++
.../libksysguard/libksysguard-5.27.7-r1.ebuild | 79 ++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch b/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch
new file mode 100644
index 000000000000..599648228272
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch
@@ -0,0 +1,36 @@
+From bf2685a3628f213e930743676a6d713e630c6a59 Mon Sep 17 00:00:00 2001
+From: Maciej Stanczew <maciej.stanczew@gmail.com>
+Date: Sun, 6 Aug 2023 20:23:01 +0200
+Subject: [PATCH] sensors: Correctly handle the return value of
+ QCollator::compare
+
+QCollator::compare() can return any integer, not just [-1, 0, 1].
+Comparing the result with -1 happened to work with most locales,
+but it broke with the C locale. As a result, when sensors were put
+into std::map, they were sometimes erroneously treated as duplicates,
+leading to a randomly incomplete and garbled sensor list.
+
+BUG: 461070
+
+
+(cherry picked from commit 0a7efca4b331eb9619a2a88fe9093cbbbd351b6e)
+---
+ sensors/SensorTreeModel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sensors/SensorTreeModel.cpp b/sensors/SensorTreeModel.cpp
+index 6f318035..8487730b 100644
+--- a/sensors/SensorTreeModel.cpp
++++ b/sensors/SensorTreeModel.cpp
+@@ -44,7 +44,7 @@ struct Compare {
+ collator->setCaseSensitivity(Qt::CaseInsensitive);
+ }
+
+- return collator->compare(first, second) == -1;
++ return collator->compare(first, second) < 0;
+ }
+
+ // This uses thread-local storage because QCollator may not be thread safe.
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild
new file mode 100644
index 000000000000..7d102918a2db
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="webengine"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+ dev-libs/libnl:3
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5[qml]
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ net-libs/libpcap
+ sys-apps/lm-sensors:=
+ sys-libs/libcap
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXres
+ webengine? (
+ >=dev-qt/qtwebchannel-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-plasma/ksysguard-5.21.90:5
+"
+
+PATCHES=(
+ # downstream patch
+ "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
+ "${FILESDIR}/${P}-sensors-correctly-handle-return-val.patch" # KDE-bug 461070, 5.27.8
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package webengine Qt5WebChannel)
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # bugs 797898, 889942: flaky test
+ local myctestargs=(
+ -E "(sensortreemodeltest)"
+ )
+ LC_NUMERIC="C" ecm_src_test # bug 695514
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-14 13:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-15 13:04 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/, kde-plasma/libksysguard/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-08-14 13:56 Andreas Sturmlechner
2022-01-25 9:49 Andreas Sturmlechner
2021-12-15 9:38 Andreas Sturmlechner
2021-02-17 22:13 Andreas Sturmlechner
2021-01-24 19:44 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox