From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- kde-frameworks/kidletime/Manifest | 5 ++- .../files/kidletime-5.92.0-crashfix.patch | 41 ++++++++++++++++++ .../kidletime/kidletime-5.92.0-r1.ebuild | 48 ++++++++++++++++++++++ kde-frameworks/kidletime/kidletime-5.92.0.ebuild | 46 --------------------- kde-frameworks/kidletime/kidletime-5.93.0.ebuild | 46 +++++++++++++++++++++ 5 files changed, 139 insertions(+), 47 deletions(-) create mode 100644 kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch create mode 100644 kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild delete mode 100644 kde-frameworks/kidletime/kidletime-5.92.0.ebuild create mode 100644 kde-frameworks/kidletime/kidletime-5.93.0.ebuild (limited to 'kde-frameworks/kidletime') diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest index fd3d24f45255..cafc01c92d50 100644 --- a/kde-frameworks/kidletime/Manifest +++ b/kde-frameworks/kidletime/Manifest @@ -1,5 +1,8 @@ +AUX kidletime-5.92.0-crashfix.patch 1315 BLAKE2B 1b931ea07a39978b3921356134af97fa864970e055bb32bc29257763d355b00de2062ae96e5e98512f3d068cd2e5d022096aae8afc77ab64f90cf8267c01c9e2 SHA512 7d46e337eeeb44a32cfae0a7b83cbfd5d31b79b6b3e6b1f0b99209ca5c082e81eace354875a9662c5eea674e98a2a47f5156d7f83f1649bafadd8173968b6e0f DIST kidletime-5.90.0.tar.xz 28888 BLAKE2B e48d99bcd3777352e229cfd62e7127a9bc6a10a5978ed9c5ffdbd866c164876faccb0b0a8a16ccefae9aa52080d21dfbf1c2a0ea7a358c4d8dcde97ff0a14d8c SHA512 ff1aa1d2fe9d7eae4e45b64fec01065da845c78c43136549c9b9b292a89bd05bce91369939886888320ddd6bf3e060b27edf0921ca5e2f3ae7b8f23577d7908a DIST kidletime-5.92.0.tar.xz 29072 BLAKE2B 7c1ab01005400b9034693c0099df980b20806a8ee5c225fcd9e3a761ea587cbfa98c52f9efdd5762ba93c9999deb5026ed189c3267369c8a04ec9a36fd20c763 SHA512 58d9c2ef675d0e3092cda43f14ea0cc51105412a0b19828659f0e4eb386870675bf9f8765327777aa7829ae29c878a63cfe7a00954c09315c0d4840eca8313ec +DIST kidletime-5.93.0.tar.xz 29080 BLAKE2B 0059101ea067e68cc710735b5e379189271653a263a21c3db1c93f6b4b17741d10a192b02ba7f3e565e3984dee43908dd09baa5d7cd787f5336a10726388e62c SHA512 b89d78cf37770c7894dc62bf036c2e023fbb9eeb24ddb4d22ca3a55c46b310b0cb56b2556bf88e5a70e41e9a7c1f053f5122987b5c4e5148922431dc97abd61b EBUILD kidletime-5.90.0.ebuild 862 BLAKE2B 516173626eb4d3b665dc4e0376b4715bd64215104fc821d0c341569ec06691769906226ed8fe7a304413ed1da6b5016bd52c90752ce79d0704fda1d3bc2bafdb SHA512 9ef5a75430f1b8bb4251a26f942d8b171084e13ce8fd1a531bc1a5ea92f8b1fab67d4a951c843503ae2fe78866fedd7437d08ea2dd8a5bb60bf6ef64c5c56017 -EBUILD kidletime-5.92.0.ebuild 865 BLAKE2B 4ebaffe714d4ad26ada85811b9c2f71dae00da732605d32dac6f4f04713796355eaa7da1f5479669d84ecf2f5f0ec437bdce8a6a433e04115dc124d9ad014de2 SHA512 33ce11962b39772d9c1ba4857ef32bcb22b9ab38346ff3f2634d3178ffba68f2b8a0f3d5a0b5b276e3ebbdc8a6a8a16bb9f7bf894b410bb1452351dc2fb54242 +EBUILD kidletime-5.92.0-r1.ebuild 929 BLAKE2B fa74d55db3e62706d82199f860c27a87556360c943c0726216155765f33729b5cd0f543b021269771c88e7a4586970039fbb6badea1d623185753345ec54cf72 SHA512 6cea3f2ab275153e0bc5dbd0bb02aea67604e2169ad0546d48460abdbfa92ba55aa3d86d341ff2df1cf806619d0f596bf2170e6242b95873940ab669a1549fa7 +EBUILD kidletime-5.93.0.ebuild 865 BLAKE2B 4ebaffe714d4ad26ada85811b9c2f71dae00da732605d32dac6f4f04713796355eaa7da1f5479669d84ecf2f5f0ec437bdce8a6a433e04115dc124d9ad014de2 SHA512 33ce11962b39772d9c1ba4857ef32bcb22b9ab38346ff3f2634d3178ffba68f2b8a0f3d5a0b5b276e3ebbdc8a6a8a16bb9f7bf894b410bb1452351dc2fb54242 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 new file mode 100644 index 000000000000..93a016d76fd0 --- /dev/null +++ b/kde-frameworks/kidletime/files/kidletime-5.92.0-crashfix.patch @@ -0,0 +1,41 @@ +From cd5040684723b87c7ba5b7cc1b1a63402902a641 Mon Sep 17 00:00:00 2001 +From: Ada Christine +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 new file mode 100644 index 000000000000..37fdb5a1a54c --- /dev/null +++ b/kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild @@ -0,0 +1,48 @@ +# 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 +} diff --git a/kde-frameworks/kidletime/kidletime-5.92.0.ebuild b/kde-frameworks/kidletime/kidletime-5.92.0.ebuild deleted file mode 100644 index 5d38376e94b0..000000000000 --- a/kde-frameworks/kidletime/kidletime-5.92.0.ebuild +++ /dev/null @@ -1,46 +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}" - -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 -} diff --git a/kde-frameworks/kidletime/kidletime-5.93.0.ebuild b/kde-frameworks/kidletime/kidletime-5.93.0.ebuild new file mode 100644 index 000000000000..5d38376e94b0 --- /dev/null +++ b/kde-frameworks/kidletime/kidletime-5.93.0.ebuild @@ -0,0 +1,46 @@ +# 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}" + +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 +} -- cgit v1.2.3