diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-12-04 02:07:22 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-04 02:07:22 +0000 |
commit | 38ecaf88ae0891dd2d7f2bdd9a7acdcd45835724 (patch) | |
tree | 9416e00c684e43c1731a2189865034d568f2a20f /kde-plasma/libksysguard | |
parent | 7f4b508a2da3c371c7e770aa6ab83b0c4237cd1c (diff) |
gentoo auto-resync : 04:12:2024 - 02:07:22
Diffstat (limited to 'kde-plasma/libksysguard')
4 files changed, 0 insertions, 183 deletions
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index 08a239849b06..cda45bc7839c 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,9 +1,5 @@ -AUX libksysguard-6.2.3-fix-piechart-text.patch 2880 BLAKE2B f38506e9cbf4c043a28865a8e2b3a6f35499ad5d55ceba636962ddf70e930280662eb2a7f4c66badf29f0bdef3e42e52001d9843b42a1cd106b0f55c8ed80336 SHA512 6e374198fb79ab473eff39bd353fe2ebed54e67d230cd56b00a441e8306fe80028e54d6a80ebd4dcdc144fb2d751541ed5b44951c4521ed95e54d21ca09996e6 -AUX libksysguard-6.2.3-fix-saving-presets.patch 1935 BLAKE2B 5b4422c5e2dfb6db05588470547c8a433a73c441e9f52f54445d4f64864b9cd20ef0b6863a9bd83e019babc8891ded017a4c37ec2c96002579be7859fe7cf7a7 SHA512 f719a8f98b12aa93d4a8aabd5770c2d00abef91c13d8b4f7f2125ac501415045da4af8c0cb1b473a14b7d777d2f457b8b55624067212441ad21bf409d147216b DIST libksysguard-6.1.5.tar.xz 306220 BLAKE2B 37f7e9c7fc1e91a0cfa4ab18b276e3d5187cb0a2a543a6a8d8d61a125cff49bcb1b73b85a1a3ea1f4079d10a94431995c5812e51198a7a12bf8f457b678b42af SHA512 d3ffec5479510241c3d006a7d0bc8ed23cd37dad84422c48bf8dad3eca62883759c2a536ffabe1bede1073144415f53cca8c2099129e96b18c8283a9e4e48140 -DIST libksysguard-6.2.3.tar.xz 314808 BLAKE2B 629cb4164253a48e3b186fb2675a2c48ca6c2e65e42ef7ced131acff1a8f775d42b8ba9929adca05b62f06e73198966c2f5c89028ab97891ac90c593ec6b6573 SHA512 2dc2e51e9d4b1050d1f828dec9067e62ec5ced759334fd5286dce77fa25951d3b50fc06485e9e4dbdf5e16da9444ef24e699c752a7f11141ac5ab0e0c15b284f DIST libksysguard-6.2.4.tar.xz 315552 BLAKE2B 412294411ef5c455723d83a593c17ed16882eb8dab2b8b175f1612ca3f6398a62515f5e4f29c280397a7d4e83aa93b4ea24e8430482a06c0e785b1a4217d45eb SHA512 39276ac998858e9f8988d4b595c5d407a2aba0aedec4775c83cd96834c2e109171d570e49e4bf2ae17829baa5a3c157c229c99e41a57d8f407e4e3678a9f5fab EBUILD libksysguard-6.1.5.ebuild 992 BLAKE2B 0c30f38181f7c6461472ad54caade3557b93ee99def6ebce16d59f107813b0bf57195007dd7cd1208959520bd643b59c63d8ae83d3fd0f2170f93c755f046a99 SHA512 b722f348e15c567f104bf8b0110fa5752a5a99b8f9774e7078a77d66be7815bfa6d1a3147104928118b77bf2bf938bf8207dca16092eebcc0625789fdb8445b0 -EBUILD libksysguard-6.2.3-r1.ebuild 1437 BLAKE2B d8be7c10962efece5e815bb7020d2d2d6ac2f7b3f2a2f1d49cae219f798e8e889408b0be630139242a5d320b8dfb9639d34977c1e8703f2930e7be2cdf65e2cd SHA512 3ae01eef56615a685eb8e6d212a6c97788422e07f73ecbe8e6668818d73e4fe5119ff4343e5f4cddd574dd0eb0a231199bc53dc5e44cbcac45668ec4d16d9b7f EBUILD libksysguard-6.2.4.ebuild 1299 BLAKE2B e414e363f1c5a4ca1f49543b40b74ed5c9b44937a6a932e1a19e8fd9132d3d6bca532c47000a0dd857e6978d3bcc67bf0f0ee3b77769d88bc7d94d5780aef4bb SHA512 500d7b9df6824f2a55e35c7f735d44bf207f5a7c53c5dfe7de4d6f792fa0d11bb138c2d6d5020f5ee005c4eaf945643f4ad5f0f586686733535afaa293233900 MISC metadata.xml 405 BLAKE2B bcb21392b01841281d5be1a06b02ad3a07d7d4b288e0b1319b8eb65a85d7aa981c9c0e055a48bf9d574eb4b067a0836721ad7d439016e6ce37d40296e09a8c0b SHA512 347c61a7551f8875a440372c42ffa4d391558645ea3e475cf5b3de4889ea774db6867c065e14884ee665eb5857d53b7ab57504368d5da2a1ea05376dac1988ed diff --git a/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-piechart-text.patch b/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-piechart-text.patch deleted file mode 100644 index cad55fa104a7..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-piechart-text.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6e164d04743823fca6392ed9cce9e75acd537a0c Mon Sep 17 00:00:00 2001 -From: Arjen Hiemstra <ahiemstra@heimr.nl> -Date: Wed, 6 Nov 2024 12:22:02 +0000 -Subject: [PATCH 1/4] faces/piechart: Use GraphicalEffects.Glow for rendering - outline of compact text - -Apparently using style Text.Outline leads to some pretty bad text -rendering. So instead use Glow from GraphicalEffects to achieve a -similar effect but one that's smoother. Unfortunately this uses -deprecated API because MultiEffect turns out to be completely unusable. - -BUG: 494495 - - -(cherry picked from commit 69c7ad2122b1c5dd6fcc3edaa8be4ec597bdfda5) - -Co-authored-by: Arjen Hiemstra <ahiemstra@heimr.nl> ---- - .../piechart/contents/ui/UsedTotalDisplay.qml | 21 +++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml b/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml -index 50242cfc..52cc787c 100644 ---- a/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml -+++ b/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml -@@ -8,6 +8,8 @@ import QtQuick - import QtQuick.Controls - import QtQuick.Layouts - -+import Qt5Compat.GraphicalEffects -+ - import org.kde.kirigami as Kirigami - - import org.kde.ksysguard.formatter as Formatter -@@ -87,17 +89,24 @@ Item { - fontSizeMode: Text.HorizontalFit - minimumPointSize: Kirigami.Theme.smallFont.pointSize * 0.8 - -- // When we're small the text is allowed to flow over the underlying -- // pie chart, to improve contrast we render it with an outline using -- // the inverse text color. -- style: root.constrained ? Text.Outline : Text.Normal -- styleColor: Qt.rgba(1.0 - Kirigami.Theme.textColor.r, 1.0 - Kirigami.Theme.textColor.g, 1.0 - Kirigami.Theme.textColor.b, 1.0) -- - // This slightly odd combination ensures that when the width becomes - // too small, the unit gets hidden because the text wraps but the - // wrapped part is hidden due to maximumLineCount. - wrapMode: Text.Wrap - maximumLineCount: 1 -+ -+ // When we're small we want to overlap the text onto the chart. To -+ // ensure the text remains readable, we want to have some sort of -+ // outline behind the text. Unfortunately, there is no way to -+ // achieve the visual effect we want here without using deprecated -+ // GraphicalEffects. MultiEffect is completely unusable and using -+ // `style: Text.Outline` makes the font rendering look pretty bad. -+ layer.enabled: root.constrained -+ layer.effect: Glow { -+ radius: 4 -+ spread: 0.75 -+ color: Kirigami.Theme.backgroundColor -+ } - } - - Kirigami.Separator { --- -2.47.0 - diff --git a/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-saving-presets.patch b/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-saving-presets.patch deleted file mode 100644 index dfd4bd0dd936..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-saving-presets.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9ea3571c903db1ebe72d5091eefc052288af252f Mon Sep 17 00:00:00 2001 -From: Arjen Hiemstra <ahiemstra@heimr.nl> -Date: Thu, 7 Nov 2024 11:54:35 +0100 -Subject: [PATCH 4/4] faces: Ensure the temporary dir for a preset remains - until installed - -QTemporaryDir deletes the temporary directory when it goes out of scope. -However, installing the preset with KPackage is an asynchronous -operation that can extend beyond the current scope. This can cause the -preset data to be deleted while we're still installing. To ensure this -doesn't happen, extend the lifetime of the QTemporaryDir into the lambda -we use to handle the job finished, so that it lives at least as long as -the job. - -BUG: 485164 ---- - faces/SensorFaceController.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp -index 06eda200..60e6a579 100644 ---- a/faces/SensorFaceController.cpp -+++ b/faces/SensorFaceController.cpp -@@ -954,6 +954,11 @@ void SensorFaceController::savePreset() - pluginName += QString::number(suffix); - } - -+ // Important! We need to ensure the directory remains valid as long as it has -+ // not been installed yet. Since the install is asynchronous, we need to make -+ // sure that the QTemporaryDir does not go out of scope until the install is -+ // finished, so this directory will be moved into the lambda connected to the -+ // job finished signal below to ensure it lives as long as the job. - QTemporaryDir dir; - if (!dir.isValid()) { - return; -@@ -1013,7 +1018,7 @@ void SensorFaceController::savePreset() - configGroup.sync(); - - auto *job = KPackage::PackageJob::install(QStringLiteral("Plasma/Applet"), dir.path()); -- connect(job, &KJob::finished, this, [this]() { -+ connect(job, &KJob::finished, this, [this, dir = std::move(dir)]() { - d->availablePresetsModel->reload(); - }); - } --- -2.47.0 - diff --git a/kde-plasma/libksysguard/libksysguard-6.2.3-r1.ebuild b/kde-plasma/libksysguard/libksysguard-6.2.3-r1.ebuild deleted file mode 100644 index 2880a6b41ff2..000000000000 --- a/kde-plasma/libksysguard/libksysguard-6.2.3-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=6.6.0 -QTMIN=6.7.2 -inherit ecm fcaps plasma.kde.org - -DESCRIPTION="Task management and system monitoring library" - -LICENSE="LGPL-2+" -SLOT="6/9" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - 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 -" -RDEPEND="${DEPEND} - >=dev-qt/qt5compat-${QTMIN}:6[qml] -" - -# -m 0755 to avoid suid with USE="-filecaps" -FILECAPS=( -m 0755 cap_sys_nice=ep usr/libexec/ksysguard/ksgrd_network_helper ) - -PATCHES=( - "${FILESDIR}/${P}-fix-piechart-text.patch" # KDE-bug #494495 - "${FILESDIR}/${P}-fix-saving-presets.patch" # KDE-bug #485164 -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON - ) - ecm_src_configure -} - -src_test() { - # bugs 797898, 889942: flaky test - local myctestargs=( - -E "(sensortreemodeltest)" - ) - LC_NUMERIC="C" ecm_src_test # bug 695514 -} - -pkg_postinst() { - ecm_pkg_postinst - fcaps_pkg_postinst -} |