summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-08-06 08:56:30 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-08-06 09:18:35 +0200
commit6ee4b446273a3f7f6729178d16c996afb443e1b0 (patch)
tree557fc7ba4b46215247c6491ba0f0bffe4075d7ef /kde-frameworks/kidletime
parentkde-frameworks/ki18n: drop 5.92.0 (diff)
downloadgentoo-6ee4b446273a3f7f6729178d16c996afb443e1b0.tar.gz
gentoo-6ee4b446273a3f7f6729178d16c996afb443e1b0.tar.bz2
gentoo-6ee4b446273a3f7f6729178d16c996afb443e1b0.zip
kde-frameworks/kidletime: drop 5.92.0-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kidletime')
-rw-r--r--kde-frameworks/kidletime/Manifest1
-rw-r--r--kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch41
-rw-r--r--kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild48
3 files changed, 0 insertions, 90 deletions
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 27722690d0d5..fbfb285d34a5 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1 @@
-DIST kidletime-5.92.0.tar.xz 29072 BLAKE2B 7c1ab01005400b9034693c0099df980b20806a8ee5c225fcd9e3a761ea587cbfa98c52f9efdd5762ba93c9999deb5026ed189c3267369c8a04ec9a36fd20c763 SHA512 58d9c2ef675d0e3092cda43f14ea0cc51105412a0b19828659f0e4eb386870675bf9f8765327777aa7829ae29c878a63cfe7a00954c09315c0d4840eca8313ec
DIST kidletime-5.96.0.tar.xz 29108 BLAKE2B c8bda958d716da078101c075647306a31cdd6404aacf7a18cdceef47adbcaebc7831d85e2aab94816f7a4acd087bccd8888bb17ef73d82ab7a9a6e4e19701ac4 SHA512 e7f991195ed48264ef11cee07843f7bfb2b93e701bda8fc2dd450d00055b24246b349a4a76f75bb13d81dea03e8170083b28140fb4504769927f5cf68436b335
diff --git a/kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch b/kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch
deleted file mode 100644
index 93a016d76fd0..000000000000
--- a/kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cd5040684723b87c7ba5b7cc1b1a63402902a641 Mon Sep 17 00:00:00 2001
-From: Ada Christine <adachristine18@gmail.com>
-Date: Sun, 27 Mar 2022 01:29:09 +0000
-Subject: [PATCH] Fixed crash during KIdleTime::timeoutReached()
-
-timeoutReached() will cause a crash if an item is removed from associations
-during signal dispatch due to iterator invalidation. iterate over a
-const container of the assoication keys only triggering ones matching
-the current timeout value to avoid the crash and unnecessary copying
-
-BUG: 451946
----
- src/kidletime.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/kidletime.cpp b/src/kidletime.cpp
-index a58eaa6..0929285 100644
---- a/src/kidletime.cpp
-+++ b/src/kidletime.cpp
-@@ -288,13 +288,13 @@ void KIdleTimePrivate::timeoutReached(int msec)
- {
- Q_Q(KIdleTime);
-
-- for (auto it = associations.cbegin(); it != associations.cend(); ++it) {
-- if (it.value() == msec) {
-+ const auto listKeys = associations.keys(msec);
-+
-+ for (const auto key : listKeys) {
- #if KIDLETIME_BUILD_DEPRECATED_SINCE(5, 76)
-- Q_EMIT q->timeoutReached(it.key());
-+ Q_EMIT q->timeoutReached(key);
- #endif
-- Q_EMIT q->timeoutReached(it.key(), msec);
-- }
-+ Q_EMIT q->timeoutReached(key, msec);
- }
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild b/kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild
deleted file mode 100644
index df968499dec0..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXext
- )
- xscreensaver? (
- >=dev-qt/qtdbus-${QTMIN}:5
- x11-libs/libXScrnSaver
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) # KDE-bug 451946
-
-src_prepare() {
- ecm_src_prepare
- if ! use xscreensaver; then
- sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}