diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-08-02 22:01:00 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-08-07 17:43:04 +0200 |
commit | ffceef63e8f9b5ac304f3bca0cffab44a0d040d1 (patch) | |
tree | 6fdc84889308f730d53ac08a33819c88b0192bb4 /kde-plasma | |
parent | kde-plasma/libkscreen: drop 5.24.5 (diff) | |
download | gentoo-ffceef63e8f9b5ac304f3bca0cffab44a0d040d1.tar.gz gentoo-ffceef63e8f9b5ac304f3bca0cffab44a0d040d1.tar.bz2 gentoo-ffceef63e8f9b5ac304f3bca0cffab44a0d040d1.zip |
kde-plasma/libksysguard: drop 5.24.5-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
5 files changed, 0 insertions, 191 deletions
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index 1397d2339117..20daba8b539e 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,3 +1,2 @@ -DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5 DIST libksysguard-5.24.6.tar.xz 768148 BLAKE2B 434338fdf7380e8e83db4edf58949b6e040bff331c03f65ff7d5133a69ab381bf6ba89418f192d5ed1a6d1e42351389fed222e34b6c7558a9b31ec9caab3dbdf SHA512 9bc810e74821bd11fc4083d61452cd728daf00a2c2d8baa79869c2da4aca07f0db8ca3d7fbfe800110c1498bb9c94550c56dd8e82099a919b61bc76a15a8580c DIST libksysguard-5.25.4.tar.xz 782328 BLAKE2B b1fb8490bb32f8ede6dcf39dd05fd923ec8221ea847e623cd34604cb71ce60de4fa19f5586dd2e2c6d7028a4b80dea173139d3152c07a15768bd967e0163103c SHA512 d42919fb1fa95ddb26d8e8aa090268287a02b5b6c209fc9ab6af7315f9f88b7718b4b7bbde81f4447c3d167e873718da6e5e125d9d31d55f28aec498aefd0cda 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 deleted file mode 100644 index bf81b8bf68eb..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 61b981734fa7..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 35bf11ee6431..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 664a0d856123..000000000000 --- a/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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 -} |