diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 14:10:02 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 14:10:02 +0100 |
commit | 7e17b5aabc330abb894f2b90bef0e3fcbcd180d2 (patch) | |
tree | 0b0cd08ce6e24faf7c868b07127ee0b6b32153c7 /kde-frameworks/kidletime | |
parent | da3552023d9aae2ee5183df71a80a8169414974e (diff) |
gentoo auto-resync : 06:08:2022 - 14:10:01
Diffstat (limited to 'kde-frameworks/kidletime')
-rw-r--r-- | kde-frameworks/kidletime/Manifest | 3 | ||||
-rw-r--r-- | kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch | 41 | ||||
-rw-r--r-- | kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild | 48 |
3 files changed, 0 insertions, 92 deletions
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest index 9c6d5ba9a352..c9191b0703d3 100644 --- a/kde-frameworks/kidletime/Manifest +++ b/kde-frameworks/kidletime/Manifest @@ -1,6 +1,3 @@ -AUX kidletime-5.92.0-crashfix.patch 1315 BLAKE2B 1b931ea07a39978b3921356134af97fa864970e055bb32bc29257763d355b00de2062ae96e5e98512f3d068cd2e5d022096aae8afc77ab64f90cf8267c01c9e2 SHA512 7d46e337eeeb44a32cfae0a7b83cbfd5d31b79b6b3e6b1f0b99209ca5c082e81eace354875a9662c5eea674e98a2a47f5156d7f83f1649bafadd8173968b6e0f -DIST kidletime-5.92.0.tar.xz 29072 BLAKE2B 7c1ab01005400b9034693c0099df980b20806a8ee5c225fcd9e3a761ea587cbfa98c52f9efdd5762ba93c9999deb5026ed189c3267369c8a04ec9a36fd20c763 SHA512 58d9c2ef675d0e3092cda43f14ea0cc51105412a0b19828659f0e4eb386870675bf9f8765327777aa7829ae29c878a63cfe7a00954c09315c0d4840eca8313ec DIST kidletime-5.96.0.tar.xz 29108 BLAKE2B c8bda958d716da078101c075647306a31cdd6404aacf7a18cdceef47adbcaebc7831d85e2aab94816f7a4acd087bccd8888bb17ef73d82ab7a9a6e4e19701ac4 SHA512 e7f991195ed48264ef11cee07843f7bfb2b93e701bda8fc2dd450d00055b24246b349a4a76f75bb13d81dea03e8170083b28140fb4504769927f5cf68436b335 -EBUILD kidletime-5.92.0-r1.ebuild 926 BLAKE2B 24acd13051911ef419083221c5c8b3832f02a21acd32d630e2f0df6ff9893e2324206dac3bb4a00eea74fe8836b4f9434e84fdbac8510954ac98b3ee31b18304 SHA512 920d8210a3d22f339df54b8cbb9c0c912e5cd5957b318f206e4b726b77d255cbd401974b8f943409977a337b3ed5dcce92ef1f0f5a8ce6829d2194eacccb6f73 EBUILD kidletime-5.96.0.ebuild 880 BLAKE2B 7d93e8ee2eb7c39fa0375c2c71c04e5f2785b61a485d152100332452297b9e50fdf0752c6969d4787980d7bde987a724a5acfd15fa57810cdd1bbdb93e34f0c9 SHA512 5efb5bdca86be1af82dc48abd03893ac5dac5fcd93ce8bdefe9a1e952a924caec94a0e68b80f15ac3e30e8b9489227809f7cf03332130a9c73eacd6033ef18b3 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 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 -} |