* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2017-08-07 6:26 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-08-07 6:26 UTC (permalink / raw
To: gentoo-commits
commit: 6c4cb4d20253d8a158e9bdbc386ac1aab9e52ced
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 7 06:22:32 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 7 06:25:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4cb4d2
kde-plasma/libksysguard: Remove unused dep
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/libksysguard-5.10.4-unused-dep.patch | 56 ++++++++++++++++++++++
kde-plasma/libksysguard/libksysguard-5.10.4.ebuild | 2 +
2 files changed, 58 insertions(+)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch
new file mode 100644
index 00000000000..f76c8df1cbf
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch
@@ -0,0 +1,56 @@
+From b6ed1afd8a8a4104a9fcf09c3322bf6d69231622 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Mon, 7 Aug 2017 00:25:11 +0200
+Subject: libksysguard does not appear to use QtScript, but just includes it.
+
+Removing it makes it build with a clean Qt5.9 where QtScript no longer exists.
+
+Reviewed by: davidedmundson
+
+Differential Revision: https://phabricator.kde.org/D7036
+---
+ CMakeLists.txt | 2 +-
+ processui/CMakeLists.txt | 1 -
+ processui/scripting.cpp | 2 --
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 84a4479..83987ad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,7 +9,7 @@ include(WriteBasicConfigVersionFile)
+ find_package(ECM 1.2.0 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+-find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets Script)
++find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets)
+ find_package(Qt5WebKitWidgets CONFIG)
+ set_package_properties(Qt5WebKitWidgets PROPERTIES
+ URL "git://gitorious.org/qt/qtwebkit.git"
+diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
+index 1927839..4dfcbd4 100644
+--- a/processui/CMakeLists.txt
++++ b/processui/CMakeLists.txt
+@@ -35,7 +35,6 @@ target_link_libraries(processui
+ KF5::ConfigCore
+ PRIVATE
+ Qt5::DBus
+- Qt5::Script
+ KF5::I18n
+ KF5::WindowSystem
+ KF5::Auth
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp
+index 2aa7088..afdf949 100644
+--- a/processui/scripting.cpp
++++ b/processui/scripting.cpp
+@@ -28,8 +28,6 @@
+ #include <QDirIterator>
+ #include <QFile>
+ #include <QFileInfo>
+-#include <QScriptValue>
+-#include <QScriptContext>
+ #include <QTextStream>
+ #include <QDialog>
+ #include <QUrl>
+--
+cgit v0.11.2
diff --git a/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild
index ec3503698dd..a05dfa328b5 100644
--- a/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.10.4.ebuild
@@ -42,6 +42,8 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
"
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2021-09-14 9:04 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-09-14 9:04 UTC (permalink / raw
To: gentoo-commits
commit: e15cdc4f331d1ef228c562dd3cffddede63734a4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 08:26:50 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 09:03:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e15cdc4f
kde-plasma/libksysguard: Rebase no-detailed-mem-message.patch
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...bksysguard-5.22.5-no-detailed-mem-message.patch | 28 ++++++++++++++++++++++
kde-plasma/libksysguard/libksysguard-5.22.5.ebuild | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..352cad76b76
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
@@ -0,0 +1,28 @@
+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/libksysguard-5.22.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
index 70c379be6c7..425cdf4f1e9 100644
--- a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
@@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/plasma-workspace-5.18.80:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+PATCHES=( "${FILESDIR}/${P}-no-detailed-mem-message.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2021-09-16 11:14 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-09-16 11:14 UTC (permalink / raw
To: gentoo-commits
commit: f154465b06f8fda8814d08e553c3956e0a1eb6b5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 11:59:28 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 11:09:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f154465b
kde-plasma/libksysguard: drop 5.21.5*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/libksysguard/Manifest | 1 -
...bksysguard-5.16.0-no-detailed-mem-message.patch | 26 --------
kde-plasma/libksysguard/libksysguard-5.21.5.ebuild | 69 ----------------------
3 files changed, 96 deletions(-)
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 960633d4da9..9c619ce982a 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1 @@
-DIST libksysguard-5.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec
DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
deleted file mode 100644
index 477f88d4e55..00000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 49c5fdcc3bfdfedfaeaabac4f0070b986a166ce2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 7 Jun 2019 22:58:55 +0200
-Subject: [PATCH] Gentooify message about QtWebEngineWidgets
-
-Translations can not be provided for this.
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 83cf895..647194a 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -242,7 +242,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 HAVE_QTWEBENGINEWIDGETS
---
-2.21.0
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
deleted file mode 100644
index 0c4c4f344a8..00000000000
--- a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.82.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" )
-
-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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2022-05-25 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-05-25 21:13 UTC (permalink / raw
To: gentoo-commits
commit: dbcebe7e36a1dbcf4215599ac69e93322383a641
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 19:28:10 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 25 21:10:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbcebe7e
kde-plasma/libksysguard: Backport several 5.24.6 fixes
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...bksysguard-5.24.5-fix-missing-gpu-sensors.patch | 32 +++++++++
...ard-5.24.5-fix-missing-selfmade-presets-1.patch | 35 ++++++++++
...ard-5.24.5-fix-missing-selfmade-presets-2.patch | 43 ++++++++++++
.../libksysguard/libksysguard-5.24.5-r1.ebuild | 80 ++++++++++++++++++++++
4 files changed, 190 insertions(+)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch
new file mode 100644
index 000000000000..bf81b8bf68eb
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch
@@ -0,0 +1,32 @@
+From 88722b18c92f3a688a69abef9022cbcdcb5163bb Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Fri, 29 Apr 2022 13:59:38 +0200
+Subject: [PATCH] Fall back to power average if input is not available
+
+Some power sensors don't expose a current value most notably amdgpu.
+For those fall back to the average reading if available.
+BUG:445920
+
+
+(cherry picked from commit 7758d202eed28169c031e099e408ea258469e408)
+---
+ systemstats/SensorsFeatureSensor.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/systemstats/SensorsFeatureSensor.cpp b/systemstats/SensorsFeatureSensor.cpp
+index 6c8bdb34..3555115f 100644
+--- a/systemstats/SensorsFeatureSensor.cpp
++++ b/systemstats/SensorsFeatureSensor.cpp
+@@ -95,6 +95,9 @@ makeSensorsFeatureSensor(const QString &id, const sensors_chip_name *const chipN
+ break;
+ case SENSORS_FEATURE_POWER:
+ valueFeature = sensors_get_subfeature(chipName, feature, SENSORS_SUBFEATURE_POWER_INPUT);
++ if (!valueFeature) {
++ valueFeature = sensors_get_subfeature(chipName, feature, SENSORS_SUBFEATURE_POWER_AVERAGE);
++ }
+ unit = UnitWatt;
+ maximum = getValueOfFirstExisting({SENSORS_SUBFEATURE_POWER_CRIT, SENSORS_SUBFEATURE_POWER_MAX});
+ break;
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch
new file mode 100644
index 000000000000..61b981734fa7
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch
@@ -0,0 +1,35 @@
+From b94b0e11f9c0f718f109f37dad8a889301f3a59a Mon Sep 17 00:00:00 2001
+From: Arjen Hiemstra <ahiemstra@heimr.nl>
+Date: Mon, 9 May 2022 19:05:06 +0200
+Subject: [PATCH] Faces: Write preset faceproperties to the right location
+
+When loading presets we expect the faceproperties file to be located in
+"contents/config/" but when writing we are placing it in "contents/"
+which means that custom presets are not loaded properly.
+
+BUG: 450745
+
+
+(cherry picked from commit 05866a594198d8c76814d8cd4eb3e83cc9123c8d)
+---
+ faces/SensorFaceController.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp
+index d3daa87d..21fb2954 100644
+--- a/faces/SensorFaceController.cpp
++++ b/faces/SensorFaceController.cpp
+@@ -938,8 +938,8 @@ void SensorFaceController::savePreset()
+ cg.sync();
+
+ QDir subDir(dir.path());
+- subDir.mkdir(QStringLiteral("contents"));
+- KConfig faceConfig(subDir.path() % QStringLiteral("/contents/faceproperties"));
++ subDir.mkpath(QStringLiteral("contents/config"));
++ KConfig faceConfig(subDir.path() % QStringLiteral("/contents/config/faceproperties"));
+
+ KConfigGroup configGroup(&faceConfig, "Config");
+ configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(totalSensors()).toJson(QJsonDocument::Compact));
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch
new file mode 100644
index 000000000000..35bf11ee6431
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch
@@ -0,0 +1,43 @@
+From 0d06f3fdda71e87d70a4ca8d45af6badb3ab4ee1 Mon Sep 17 00:00:00 2001
+From: Arjen Hiemstra <ahiemstra@heimr.nl>
+Date: Mon, 9 May 2022 19:08:10 +0200
+Subject: [PATCH] Faces: Do not write resolved sensors to preset file
+
+The three sensor properties of FaceController contain the resolved
+sensors. This means we are not writing group regular expressions to face
+presets but are wiriting only the local sensors that were found for that
+group, pretty much bypassing why we have the groups in the first place.
+The unresolved sensors are only contained in the sensor configuration,
+so read them from there and write that to the preset faceproperties.
+
+
+(cherry picked from commit 1ea0671de11ea51aa2e181deafb70d8da588a2af)
+---
+ faces/SensorFaceController.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp
+index 21fb2954..632b7dd4 100644
+--- a/faces/SensorFaceController.cpp
++++ b/faces/SensorFaceController.cpp
+@@ -942,9 +942,14 @@ void SensorFaceController::savePreset()
+ KConfig faceConfig(subDir.path() % QStringLiteral("/contents/config/faceproperties"));
+
+ KConfigGroup configGroup(&faceConfig, "Config");
+- configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(totalSensors()).toJson(QJsonDocument::Compact));
+- configGroup.writeEntry(QStringLiteral("highPrioritySensorIds"), QJsonDocument(highPrioritySensorIds()).toJson(QJsonDocument::Compact));
+- configGroup.writeEntry(QStringLiteral("lowPrioritySensorIds"), QJsonDocument(lowPrioritySensorIds()).toJson(QJsonDocument::Compact));
++
++ auto sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("totalSensors"));
++ configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(sensors).toJson(QJsonDocument::Compact));
++ sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("highPrioritySensorIds"));
++ configGroup.writeEntry(QStringLiteral("highPrioritySensorIds"), QJsonDocument(sensors).toJson(QJsonDocument::Compact));
++ sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("lowPrioritySensorIds"));
++ configGroup.writeEntry(QStringLiteral("lowPrioritySensorIds"), QJsonDocument(sensors).toJson(QJsonDocument::Compact));
++ configGroup.writeEntry(QStringLiteral("chartFace"), faceId());
+
+ KConfigGroup colorsGroup(&faceConfig, "SensorColors");
+ d->colorsGroup.copyTo(&colorsGroup);
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..5e70bb4448e2
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.90.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
+ "${FILESDIR}"/${P}-fix-missing-gpu-sensors.patch # KDE-bug 445920
+ "${FILESDIR}"/${P}-fix-missing-selfmade-presets-{1,2}.patch # KDE-bug 450745
+)
+
+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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2023-09-19 15:27 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-09-19 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 647763b9356d2aa643e8279e6b9c44cd4b2dbe19
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 14:49:57 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 15:23:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647763b9
kde-plasma/libksysguard: Drop unused dependency
Closes: https://bugs.gentoo.org/914145
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libksysguard-5.27.8-cmake.patch | 40 +++++++++++
.../libksysguard/libksysguard-5.27.8-r1.ebuild | 78 ++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.27.8-cmake.patch b/kde-plasma/libksysguard/files/libksysguard-5.27.8-cmake.patch
new file mode 100644
index 000000000000..45564b7acfdb
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.27.8-cmake.patch
@@ -0,0 +1,40 @@
+From 4ea3547f3fb2d1d73b3c4e1c78cdc3902341b652 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 16 Sep 2023 17:53:34 +0200
+Subject: [PATCH] Drop unused KCompletion
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 0d5d7f70771fb6caf6fc84a840a708df4e980493)
+---
+ CMakeLists.txt | 2 +-
+ processui/CMakeLists.txt | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5a0ca48..67b8242d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,7 @@ set_package_properties(Qt${QT_MAJOR_VERSION}WebChannel PROPERTIES
+ )
+
+
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package NewStuff)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package NewStuff)
+
+ find_package(ZLIB REQUIRED)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
+diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
+index c9bd8007..e61bd784 100644
+--- a/processui/CMakeLists.txt
++++ b/processui/CMakeLists.txt
+@@ -45,7 +45,6 @@ target_link_libraries(processui
+ KF5::I18n
+ KF5::WindowSystem
+ KF5::AuthCore
+- KF5::Completion
+ KF5::ConfigWidgets
+ KF5::WidgetsAddons
+ KF5::IconThemes
+--
+2.42.0
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.27.8-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.8-r1.ebuild
new file mode 100644
index 000000000000..c98e4b5e741d
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.27.8-r1.ebuild
@@ -0,0 +1,78 @@
+# 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
+RDEPEND="
+ 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/kconfig-${KFMIN}:5[qml]
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ >=kde-frameworks/solid-${KFMIN}:5
+ net-libs/libpcap
+ sys-apps/lm-sensors:=
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXres
+ webengine? (
+ >=dev-qt/qtwebchannel-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5
+ )
+"
+DEPEND="${RDEPEND}
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ x11-base/xorg-proto
+"
+BDEPEND="sys-libs/libcap"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream patch
+ "${FILESDIR}/${P}-cmake.patch" # bug 914145
+)
+
+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] 5+ messages in thread
end of thread, other threads:[~2023-09-19 15:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-14 9:04 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-09-19 15:27 Andreas Sturmlechner
2022-05-25 21:13 Andreas Sturmlechner
2021-09-16 11:14 Andreas Sturmlechner
2017-08-07 6:26 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox