From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- kde-plasma/libksysguard/Manifest | 9 ++- ...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 ++++++++++++ kde-plasma/libksysguard/libksysguard-5.24.4.ebuild | 76 -------------------- .../libksysguard/libksysguard-5.24.5-r1.ebuild | 80 ++++++++++++++++++++++ kde-plasma/libksysguard/libksysguard-5.24.5.ebuild | 76 -------------------- kde-plasma/libksysguard/libksysguard-5.25.2.ebuild | 75 ++++++++++++++++++++ 8 files changed, 271 insertions(+), 155 deletions(-) create mode 100644 kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch create mode 100644 kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch create mode 100644 kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch delete mode 100644 kde-plasma/libksysguard/libksysguard-5.24.4.ebuild create mode 100644 kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild delete mode 100644 kde-plasma/libksysguard/libksysguard-5.24.5.ebuild create mode 100644 kde-plasma/libksysguard/libksysguard-5.25.2.ebuild (limited to 'kde-plasma/libksysguard') diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index cc00cd67252f..bc488fd657a5 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,6 +1,9 @@ AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b -DIST libksysguard-5.24.4.tar.xz 767300 BLAKE2B cfb42c1da82bb90c33ab14d87351e009759afd294b3cd44ab98f2310f0dba520f421c26d3db4f1031d8d8c6086e63b14eebcc3ceaa4db2d9479d6571c409450b SHA512 a43c10109ee36d4840fae30ef73209e0a0bf43c076e94d57642aa6f89aadb95928751281342e52f01357b2b1dde788c5d034c595e22f5fc6ce1c2da3979dc5c2 +AUX libksysguard-5.24.5-fix-missing-gpu-sensors.patch 1276 BLAKE2B 530cef6db80e2553f54209fcc744161574a1a0f59801e9a6c7660360e858ea86fd0677b6f9c0cb38219d7e76fb637e6ce45701ff25175ccc926615f9197710eb SHA512 9db1f22330b8efba830f0e03288cfb6563adfdb86aa6f4aa668a9527ad326f7eb9f9e3284343a97f64622e244358f59445c2c820aaab5a2e8b166b129819a19f +AUX libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch 1363 BLAKE2B e2d793bd5ee679a8ae28bb80570381d598db3c8d9b20b2198a3391c844b0f0e27f3863596bb2b08db715e5cd58ea5e02a50f470eefd0de55ffef43cb875095f7 SHA512 c00f77cab757a6fb7c8d09e0aea0b295370ef2b0ba7568f9945144e593a46e57811dfc4ae406479d8cf040e64419ae88ea21e24efd074eb02f2a2f1b2158f6a0 +AUX libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch 2454 BLAKE2B 7c0913db01d4e10491688a5b4ec5ccb26130781f7dd140aed0b6dbd356c52456b0e919f2441df91573a9b1153350c3a5abd38b0f05356d5df227289c5fd4cfa3 SHA512 f8054ca9558dad76c2c125ffb6237c1c492fbe2a4eb08b25a822f96b7abb50105954e7b627a662552941a8a6b97d2eb1b01166938848bbe86a6279ae67edac19 DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5 -EBUILD libksysguard-5.24.4.ebuild 1827 BLAKE2B 70090e9b3a9d6a660c5a11673d850b7e947097174fd8fdf365d2c0d3cd58784f775e3124b47baaa2153ffdfc8ebdd6f369712682c0ceffd2ea558f35fd3ceaa8 SHA512 3ba7cf70b9c453c28deb1e4caa957c0a102542951eb02357ce3c03c1a09d228a4468033f4d580037d09f0daeffc69b3aef1eae98afa7e01818264347a5dc9462 -EBUILD libksysguard-5.24.5.ebuild 1830 BLAKE2B 6cfcd94f081cb32d9feb5402f129a05e8d32fc601c0fb958217ea1b9f7f405489bd71fd43061f278c0cf84eb02ef5f780111146f04a0498d20cb5b78fc4fc9e4 SHA512 22a50b0fc4fe894995cfaed0e52dc8c09c6b8889efbe0717c8cff7a6d299e8972e7367aa2e8a756063396aa4e2ca051743333d5914d990a8f54dca9112f1b439 +DIST libksysguard-5.25.2.tar.xz 771300 BLAKE2B a57d186ee436e00b8941ff776c990d9f40012561b001331095e0355a3543efd25f4ae31c5b2d2d2eb268c9507825eddc8c7c4d03dc5c06c91b448ed90ae2d9bd SHA512 2bce6c82393c7d934323bed650a5d95ce00add6509577c404faaa1742ca7ab21d0bfad85c6a035aaf95ba34a21c96372ebac34c9643cce0660032b37fc1b3f4e +EBUILD libksysguard-5.24.5-r1.ebuild 1973 BLAKE2B 709a4f85d07feecfd53109205d4aa660fc923bbd41ebf5c24dc08808037b365147574d91db7089f2dcfc6b591bc32c496c34b9a7e88548944cdb4985cf6d6aea SHA512 08f5cbae335dbb86bd979f2b9d99cea20b17f3d4325ed6db89b87914179c7a26c6030456327226fe1d39a585d7ee0177f4c8175c1566a231a658497f48a79c54 +EBUILD libksysguard-5.25.2.ebuild 1800 BLAKE2B 324c9c2651c09818926475ae9bb08a261677a31eb4fa1a4a49babb96f5e688bb07480e545de642ac40655fc22eb56b01dc733c61b0ed20d74e21a5a5ffcc4748 SHA512 a1fc37b40997cec3d9fa2454cffbc9eb67062c55360d4ae1ef809c0f8c874d3bd1401b6db23c1d8e1b7cbdea85121a66fd7c1e28ed8b4989924d8f8c5a7172c7 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302 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 +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 +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 +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.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild deleted file mode 100644 index 8a5ba3fd7afa..000000000000 --- a/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild +++ /dev/null @@ -1,76 +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} - !