kde-frameworks/kguiaddons: drop 5.102.0-r1

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2023-04-22 18:10:28 +02:00
parent f96c8696e6
commit a58f9706c8
3 changed files with 0 additions and 95 deletions

View File

@@ -1,3 +1,2 @@
DIST kguiaddons-5.102.0.tar.xz 78104 BLAKE2B 59f1e0718790fec770af182a2bd2c0770d708e022e3637bb1986fc7950377f27fcd36a39db7b80f33f502ac41140c4c581d50e1adacd09af814e5b03f1a3977c SHA512 933cc5dae575567b9f568ee778e90614c369ff6b3432b083b4c2fb94cca957b698050a3a4bebe4de11d70fc7b2484022977a77093a2d671002eacbde0921b565
DIST kguiaddons-5.104.0.tar.xz 78208 BLAKE2B eb32a2e7c91d7f51662cc9e3aa747d47d7de7c23c04d1614cd896ae787e4c3a6750a4632453342231f132be6ac2631b4e0313ced323bc123644d4cee2ec76d78 SHA512 140300f55f8dba5a71541ef397f626ea8e2c18f640e7a52b6c929d3eea12f4b3e0e884ec31a2bd9a5bf4f7bc1f109a112ac27eb70240391c93ee7fb5a80d7015
DIST kguiaddons-5.105.0.tar.xz 78220 BLAKE2B 918a351342585ec7dbec0315f41d42a6164dbb256f196b68257a0835b20540eec504544d59ce3db0e99d30a931d240892d2c19b6d13c0adfe6c6411967f69ec6 SHA512 c2c5c98907773a572ee0877a7e5781a8c3b2d2c0e2edcc4818a8fb7c9a37d85279230dccc2d42626f7a52962264f542d28d02f9110597d45fb15db474db82ec0

View File

@@ -1,47 +0,0 @@
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

View File

@@ -1,47 +0,0 @@
# 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
}