gentoo auto-resync : 29:01:2023 - 02:53:24

3 files changed, 96 insertions, 0 deletions

diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 40132c728e86..09c6c67be85a 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,7 @@
+AUX kguiaddons-5.102.0-fix-waylandclipboard.patch 2260 BLAKE2B b048b54bd280309e547f0fd4069a030d3efda4bfa4c0e7deb79626239f2dcdc05357704a8bae203558c9551edec5e2584986eef0f51110a4279271060ea1eb1b SHA512 2d37e2f9dcb50b7349a1df61438ba69e373f50cc588b06bde8e99ae78bfe9ece1b5ba0e74590f574a8e0479f51e1cb40fa92ab28a7f4403dbb25212dfedda071
 DIST kguiaddons-5.102.0.tar.xz 78104 BLAKE2B 59f1e0718790fec770af182a2bd2c0770d708e022e3637bb1986fc7950377f27fcd36a39db7b80f33f502ac41140c4c581d50e1adacd09af814e5b03f1a3977c SHA512 933cc5dae575567b9f568ee778e90614c369ff6b3432b083b4c2fb94cca957b698050a3a4bebe4de11d70fc7b2484022977a77093a2d671002eacbde0921b565
 DIST kguiaddons-5.99.0.tar.xz 74324 BLAKE2B 9111bbad7d92ee73da6aa606246802937183986b8346cdc5b74d1115b0cd31255bd2eb379bbe2ddba6146edb607f96c735a85abf6b4831384587bf2df6b00749 SHA512 a47a9b4d642d33a4ed9cccc351fcdc317cc41482b5a10bc9a38500f6c20ba9c0afc88f864c63e5c916d205cb685b4d653f001c4f4719a86e7bc4670acbf9f108
+EBUILD kguiaddons-5.102.0-r1.ebuild 1078 BLAKE2B 095eca830c2b31d7d38afe4a87a6000496a5661f91ea7d5637e50b372052346441b7e63d01e65185d977da5b82a9ba24c7b8d6b562fc6b7f1b109a6719ae219d SHA512 f346c80b9739e72d0c8233664d1850ac5faa1e8dcf15fe10d5316757684bc8fb026d20859d973676508a93eaebba22899682249963a75cfb387086b17cd8aef8
 EBUILD kguiaddons-5.102.0.ebuild 1002 BLAKE2B 662ae41f5d7da92b40d61327bf3f8fbbdf69b90906f19837f6d92ce676aa2803ebf8d9f0d45efcddb85c93965a36d8277fa549f4faeff72f593843ccb4847a43 SHA512 6f7df88a7fea3f8280fa728fb9b0d4cd1cc21ff71ffe14a1f1cc69d295abc98722cc180fb9857385ecf95000c90ebe02b0f61e170a7404765ceb7229aac4582d
 EBUILD kguiaddons-5.99.0.ebuild 928 BLAKE2B 1e66ee806beb05532f8289352cd8879f113e9e9f0952a0ab85ac2f19a36f5bbf195071bf88b3b35222f6d99afc61b012752e7da3f8e9edb40bf0df27a1b52815 SHA512 ef749031a2fe2a9dfaa11b6e3ce9c2c674e59b69166dcbb64bd1b2ae8bad7b88dcc6a4f11b492e77421421ff14419323555d3fd00f3a9d20e96e498ff2c3ad6b
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch b/kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch
new file mode 100644
index 000000000000..e8b157abebec
--- /dev/null
+++ b/kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch
@@ -0,0 +1,47 @@
+From dcb254dc6b4e5b76e04a5ee8b4db8177aff10d29 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Fri, 27 Jan 2023 13:17:43 +0100
+Subject: [PATCH] waylandclipboard: roundtrip to get accurate focus state
+
+The current approach is too complicated and not correct anyway.
+To summarize QGuiApplication::focusWindow is delayed so the focus
+watcher was introduced, however when the window is hidden and
+setMimeData called before Wayland events have been processed,
+then focusWatcher is naturally out of sync, so the check
+was complicated to work around this state. However the same
+issue arises when the window is deleted before calling
+setMimeData.
+Instead of introducing more complicated checks and workaround
+roundtrip so the focusWatcher state is up to date before setting
+the clipboard.
+BUG:463199
+FIXED-IN: 5.103
+---
+ src/systemclipboard/waylandclipboard.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/systemclipboard/waylandclipboard.cpp b/src/systemclipboard/waylandclipboard.cpp
+index 4c68904..d6c4c08 100644
+--- a/src/systemclipboard/waylandclipboard.cpp
++++ b/src/systemclipboard/waylandclipboard.cpp
+@@ -591,9 +591,14 @@ void WaylandClipboard::setMimeData(QMimeData *mime, QClipboard::Mode mode)
+     if (!m_device) {
+         return;
+     }
+-    // If the application is focused, use the normal mechanism so a future paste will not deadlock itself
+-    // On enter Qt delays processing of the enter event but when a window is hidden the leave event arrives after hiding the window
+-    if (const auto fw = QGuiApplication::focusWindow(); (fw && fw->isVisible()) || (!fw && m_keyboardFocusWatcher->hasFocus())) {
++
++    // roundtrip to have accurate focus state when losing focus but setting mime data before processing wayland events.
++    auto native = qGuiApp->platformNativeInterface();
++    auto display = static_cast<struct ::wl_display *>(native->nativeResourceForIntegration("wl_display"));
++    wl_display_roundtrip(display);
++
++    // If the application is focused, use the normal mechanism so a future paste will not deadlock itselfs
++    if (m_keyboardFocusWatcher->hasFocus()) {
+         QGuiApplication::clipboard()->setMimeData(mime, mode);
+         return;
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild
new file mode 100644
index 000000000000..5d03529205c3
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="false"
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	dbus? ( >=dev-qt/qtdbus-${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
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 )
+	X? ( x11-libs/libxcb )
+"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-waylandclipboard.patch" ) # KDE-bug 463199
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}