gentoo auto-resync : 22:02:2023 - 14:28:15

5 files changed, 122 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 367cd3d527ea..ab49aee258ca 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index e04bcd8b3110..ff454faa5c85 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,7 @@
+AUX kidletime-5.102.0-wayland-baloo-crashfix.patch 1370 BLAKE2B 8ad609790367e77b0b5b57e5511666cd580b582060af675ddc9292bae8e5bf952938a0b0b2dcd22bdf637563c270fb00b680864d63d362cb613c62835ed8d03a SHA512 f4fef08f7e5dbe6b6aa5e200c8270b43bf539e2d330c789bb3e7b73b3acbe2ab4b45778e147702aca2224dfa3a82cfa2d0d20e4bc00fe20cfbd21f9b07125bd5
 DIST kidletime-5.102.0.tar.xz 30848 BLAKE2B ccb7b754ff573ab9dbdaf0badb5f403bb9db90ac22b0cd5a4210a866c2afd365a30ee7245337c7589c475323cbb20fbe5b3737bb99d344c3ab531c811c59833b SHA512 5aeddaf18d89c1ae5f9a23950a319d7d3659f713258e6297f1cb9a76c39514d434be80ec87e76c5fa892c445c69263742a13614ffcc5ae8a9c0cd47c57c43f08
 DIST kidletime-5.103.0.tar.xz 30844 BLAKE2B ac76387606eea145ce8b8d0b238f9f1705d674b8c26b78bc345a79f2aa450d9d900cf95adecd67803dc42034cb397c636dd4d2290cb65314a66dff0ae6330d12 SHA512 3f24b03c55edc98949272975e2374f7c4644f14af4e56f525916583926058310aca255a9c9fb54ae958061dca8b48e0b18bd48e0cf34f51292999688fd61cfa1
+EBUILD kidletime-5.102.0-r1.ebuild 1282 BLAKE2B 086543e772f3254f40461ec1bbb468712a642beea0597d93f40ccb9c81894b3dccb466cdd68891ad0f67d187ccb3553ccea3075bfeef4cf21ab80fb3e19021d2 SHA512 b5158108121d59faa205dbd1ff2d894ca83551cfce81b6a86f1cc705cab3860c782ce30a73ba43aed352b6881f2f87111e7845f6308d6307792fe79b1c32860f
 EBUILD kidletime-5.102.0.ebuild 1205 BLAKE2B b5951404af7c12c24b1b0feaa28ca53ca1e2dd346de44e4d57ef309a369ee47d30e59d40000dedb0726a780bb2a4d249cf815377c72912e5c54bd1ac4d4d14b7 SHA512 7c9c619c48b8a1d49a572520d5c9d4c3a4a0d42220fcf925e49c70d806d8aa462d6367e6b57af94cfc4e0b305a22268e55d29552f93e3022c88a12e0a6996de9
-EBUILD kidletime-5.103.0.ebuild 1208 BLAKE2B cf464157d48ab0e252066f2c813d71dc4c6a1bd76fa1901a2a2800ccd22f374445174d0b2b06ce3ed7514bbe81a8d87cece0c3f042c03f0269b0ed031bf8ab79 SHA512 d5f06d3040dc56ebc837ddc50e9344670959ecb1752fe06d3a04b493e7b377bac2cab081de525b3d83aa7b0c151cbf4a9ab45c364e33970e9ba6ced2babdc11e
+EBUILD kidletime-5.103.0-r1.ebuild 1291 BLAKE2B a6011a3c33e160e04a579ddf9277b2b24889081ac9c029cb6cd340ccf1337c302a25cc9bc954ae4c32984e333f38f37539eccab64f88c86dbf27e4a5c8c7b110 SHA512 d438efcdb417d71aea800180390fc29fb4cac3588e60874e1061b726d56277d8fe5a62349d42f3dc138372345996791cc8ca11cfd868768be304354993900793
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch b/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch
new file mode 100644
index 000000000000..da2faa692cd2
--- /dev/null
+++ b/kde-frameworks/kidletime/files/kidletime-5.102.0-wayland-baloo-crashfix.patch
@@ -0,0 +1,56 @@
+From a0da010b8c4c97792543d24f6597ba1c1b3ceaef Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Thu, 16 Feb 2023 12:16:03 +0100
+Subject: [PATCH] wayland: Guard wayland object destructors
+
+Kidletime is a singleton and the client API works by supplying ints to add
+or remove timeouts. When not all timeouts are removed before program exits,
+trying to destroy the wayland objects will crash since the lifetime of the
+wayland connection is tied to the QGuiApplication.
+BUG:465801
+FIXED-IN:5.104
+
+
+(cherry picked from commit 53779a8d8fb177762d0435634c8ca45b0a47f1db)
+---
+ src/plugins/wayland/poller.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/wayland/poller.cpp b/src/plugins/wayland/poller.cpp
+index 918766b..9c1d7ad 100644
+--- a/src/plugins/wayland/poller.cpp
++++ b/src/plugins/wayland/poller.cpp
+@@ -50,7 +50,9 @@ public:
+ 
+     ~IdleTimeoutKwin()
+     {
+-        release();
++        if (qGuiApp) {
++            release();
++        }
+     }
+ 
+ protected:
+@@ -74,7 +76,9 @@ public:
+ 
+     ~IdleTimeoutExt()
+     {
+-        destroy();
++        if (qGuiApp) {
++            destroy();
++        }
+     }
+ 
+ protected:
+@@ -120,7 +124,7 @@ public:
+     }
+     ~IdleManagerExt()
+     {
+-        if (isActive()) {
++        if (qGuiApp && isActive()) {
+             destroy();
+         }
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kidletime/kidletime-5.103.0.ebuild b/kde-frameworks/kidletime/kidletime-5.102.0-r1.ebuild
index da0df79b1718..3c3ada0ad28c 100644
--- a/kde-frameworks/kidletime/kidletime-5.103.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.102.0-r1.ebuild
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
 
+PATCHES=( "${FILESDIR}/${P}-wayland-baloo-crashfix.patch" ) # bug 895636
+
 src_prepare() {
 	ecm_src_prepare
 	if ! use xscreensaver; then
diff --git a/kde-frameworks/kidletime/kidletime-5.103.0-r1.ebuild b/kde-frameworks/kidletime/kidletime-5.103.0-r1.ebuild
new file mode 100644
index 000000000000..8912fc139445
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.103.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+QTMIN=5.15.5
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="wayland X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
+		>=dev-qt/qtwayland-${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
+	)
+"
+DEPEND="${RDEPEND}
+	wayland? (
+		>=dev-libs/plasma-wayland-protocols-1.7.0
+		>=dev-libs/wayland-protocols-1.27:0
+	)
+"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+
+PATCHES=( "${FILESDIR}/${PN}-5.102.0-wayland-baloo-crashfix.patch" ) # bug 895636
+
+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 wayland Qt5WaylandClient)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}