summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-09-26 20:32:30 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-09-26 21:06:34 +0200
commit00cbf2f94ccdbd3302b9be811426cfe9f9c2408b (patch)
tree0a5a5670759b79cc5dd60e97d967feebccca1eac /kde-plasma
parentkde-plasma/libkscreen: drop 5.27.7 (diff)
downloadgentoo-00cbf2f94ccdbd3302b9be811426cfe9f9c2408b.tar.gz
gentoo-00cbf2f94ccdbd3302b9be811426cfe9f9c2408b.tar.bz2
gentoo-00cbf2f94ccdbd3302b9be811426cfe9f9c2408b.zip
kde-plasma/libksysguard: drop 5.27.7-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/libksysguard/Manifest1
-rw-r--r--kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch36
-rw-r--r--kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild79
3 files changed, 0 insertions, 116 deletions
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 5ad7ee5f5fdd..aa85302f906f 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1 @@
-DIST libksysguard-5.27.7.tar.xz 880568 BLAKE2B 0600dc903603a8e18f61cf89bc42fa8a7bd7d2bba8df7c08f1c16231d9b5611e38cba5d5e3d02d424581103127334192428e98525b24d1f6baf183b5a0165aca SHA512 928afc2dd38dac8e8b94d2293eb7121ca9fa60f7707b969977a56d98db833af6dd1f26d7f1f726fd5c2b3f328d9357ce93751db735668d8b31002a8e476d6627
DIST libksysguard-5.27.8.tar.xz 884408 BLAKE2B 9925a6094f8c9ab0100127bced49534a99756add16107f751ce088ea8375c1d844730289124daa5e77aebcefccd34da0cccb394d71966516bbe2ee9fd7210489 SHA512 f4f4edf3b9fe56bcf9150fa7f2904773c31534f6d045d5d31e046e05e6f4be8c774e8907c11557ecb0b2f3a63b92a2203260aa0a9df789be612ce7bd9afdda08
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch b/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch
deleted file mode 100644
index 599648228272..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.27.7-sensors-correctly-handle-return-val.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From bf2685a3628f213e930743676a6d713e630c6a59 Mon Sep 17 00:00:00 2001
-From: Maciej Stanczew <maciej.stanczew@gmail.com>
-Date: Sun, 6 Aug 2023 20:23:01 +0200
-Subject: [PATCH] sensors: Correctly handle the return value of
- QCollator::compare
-
-QCollator::compare() can return any integer, not just [-1, 0, 1].
-Comparing the result with -1 happened to work with most locales,
-but it broke with the C locale. As a result, when sensors were put
-into std::map, they were sometimes erroneously treated as duplicates,
-leading to a randomly incomplete and garbled sensor list.
-
-BUG: 461070
-
-
-(cherry picked from commit 0a7efca4b331eb9619a2a88fe9093cbbbd351b6e)
----
- sensors/SensorTreeModel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sensors/SensorTreeModel.cpp b/sensors/SensorTreeModel.cpp
-index 6f318035..8487730b 100644
---- a/sensors/SensorTreeModel.cpp
-+++ b/sensors/SensorTreeModel.cpp
-@@ -44,7 +44,7 @@ struct Compare {
- collator->setCaseSensitivity(Qt::CaseInsensitive);
- }
-
-- return collator->compare(first, second) == -1;
-+ return collator->compare(first, second) < 0;
- }
-
- // This uses thread-local storage because QCollator may not be thread safe.
---
-GitLab
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild
deleted file mode 100644
index 5bec7a261e13..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.27.7-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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
-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
- >=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/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[X]
- 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
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/ksysguard-5.21.90:5
-"
-
-PATCHES=(
- # downstream patch
- "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
- "${FILESDIR}/${P}-sensors-correctly-handle-return-val.patch" # KDE-bug 461070, 5.27.8
-)
-
-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
-}