diff options
Diffstat (limited to 'kde-plasma/libksysguard')
| -rw-r--r-- | kde-plasma/libksysguard/Manifest | 4 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch | 32 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch | 35 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch | 43 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild | 80 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/libksysguard-5.27.11.ebuild (renamed from kde-plasma/libksysguard/libksysguard-5.25.2.ebuild) | 47 | ||||
| -rw-r--r-- | kde-plasma/libksysguard/libksysguard-6.0.90.ebuild | 44 |
7 files changed, 70 insertions, 215 deletions
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index 83b041697c07..2715ba19ec96 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,2 +1,2 @@ -DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5 -DIST libksysguard-5.25.2.tar.xz 771300 BLAKE2B a57d186ee436e00b8941ff776c990d9f40012561b001331095e0355a3543efd25f4ae31c5b2d2d2eb268c9507825eddc8c7c4d03dc5c06c91b448ed90ae2d9bd SHA512 2bce6c82393c7d934323bed650a5d95ce00add6509577c404faaa1742ca7ab21d0bfad85c6a035aaf95ba34a21c96372ebac34c9643cce0660032b37fc1b3f4e +DIST libksysguard-5.27.11.tar.xz 890640 BLAKE2B 61a657f8fbc1042e57ec6e4ba85a6900db680547c61a611200dddc15b94af76f5183db6dc2c867138ccfc2af67f185d16eaff130999c525b3c8b7c23e38adc42 SHA512 21ac0f398c969146a9901cb184508cfab8f1d6e75e364ca638f85e87b0a25f9c901f81696c0bd6ee060f35c54204718f891510e7816858c190d78c2b25004544 +DIST libksysguard-6.0.90.tar.xz 303432 BLAKE2B 6de363dca043bb78913de050df119c566f2cf6fa12cb37a6b939d9daab8b73648e79d24d5a443f7839e709320b70258a43e38d0b5cd97a0f362c095c84e5b5fd SHA512 57d8be1e83cde6019e737f17f22f4ba5a2ba31b167389dfb4b3feca8c0486b252375408f26afff7b62fec5829f5d31e227bf632f535141ab313a025a45d632eb 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 -} diff --git a/kde-plasma/libksysguard/libksysguard-5.25.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild index 86a4ce117496..af3dbfb6339b 100644 --- a/kde-plasma/libksysguard/libksysguard-5.25.2.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild @@ -1,75 +1,76 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_TEST="true" -KFMIN=5.94.0 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +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 X" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="webengine" -COMMON_DEPEND=" +# 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/kcompletion-${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 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=kde-frameworks/solid-${KFMIN}:5 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} +DEPEND="${RDEPEND} >=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 + x11-base/xorg-proto " +BDEPEND="sys-libs/libcap" +# downstream patch 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() { + # bugs 797898, 889942: flaky test + local myctestargs=( + -E "(sensortreemodeltest)" + ) LC_NUMERIC="C" ecm_src_test # bug 695514 } diff --git a/kde-plasma/libksysguard/libksysguard-6.0.90.ebuild b/kde-plasma/libksysguard/libksysguard-6.0.90.ebuild new file mode 100644 index 000000000000..6192afc47383 --- /dev/null +++ b/kde-plasma/libksysguard/libksysguard-6.0.90.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="true" +KFMIN=6.2.0 +QTMIN=6.7.1 +inherit ecm plasma.kde.org + +DESCRIPTION="Task management and system monitoring library" + +LICENSE="LGPL-2+" +SLOT="6/9" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + dev-libs/libnl:3 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + net-libs/libpcap + sys-apps/lm-sensors:= + sys-libs/zlib +" +DEPEND="${RDEPEND}" +BDEPEND="sys-libs/libcap" + +src_test() { + # bugs 797898, 889942: flaky test + local myctestargs=( + -E "(sensortreemodeltest)" + ) + LC_NUMERIC="C" ecm_src_test # bug 695514 +} |