gentoo auto-resync : 22:04:2023 - 18:05:23

4 files changed, 2 insertions, 99 deletions

diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 832d7d5a7c34..bc8ec81cc1c4 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,8 +1,5 @@
-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.104.0.tar.xz 78208 BLAKE2B eb32a2e7c91d7f51662cc9e3aa747d47d7de7c23c04d1614cd896ae787e4c3a6750a4632453342231f132be6ac2631b4e0313ced323bc123644d4cee2ec76d78 SHA512 140300f55f8dba5a71541ef397f626ea8e2c18f640e7a52b6c929d3eea12f4b3e0e884ec31a2bd9a5bf4f7bc1f109a112ac27eb70240391c93ee7fb5a80d7015
 DIST kguiaddons-5.105.0.tar.xz 78220 BLAKE2B 918a351342585ec7dbec0315f41d42a6164dbb256f196b68257a0835b20540eec504544d59ce3db0e99d30a931d240892d2c19b6d13c0adfe6c6411967f69ec6 SHA512 c2c5c98907773a572ee0877a7e5781a8c3b2d2c0e2edcc4818a8fb7c9a37d85279230dccc2d42626f7a52962264f542d28d02f9110597d45fb15db474db82ec0
-EBUILD kguiaddons-5.102.0-r1.ebuild 1075 BLAKE2B 3a243e973bf20e1b284a5c4a6cc9277cfcf0b8384e871d139d951f197a7005d4e733bd941b4845c59fb128434ed5561f2a3c7c9e3af4d6b1385e01f0dc9ae1b5 SHA512 22e0155f9a6601b2c084807b2190e6eab2dbe7e58d7d54a65123117738490bfc0335707ee920c3dec24f0a91d413f287a8d75a9ae24d552245d38cdb7a2ded5e
-EBUILD kguiaddons-5.104.0.ebuild 1002 BLAKE2B 662ae41f5d7da92b40d61327bf3f8fbbdf69b90906f19837f6d92ce676aa2803ebf8d9f0d45efcddb85c93965a36d8277fa549f4faeff72f593843ccb4847a43 SHA512 6f7df88a7fea3f8280fa728fb9b0d4cd1cc21ff71ffe14a1f1cc69d295abc98722cc180fb9857385ecf95000c90ebe02b0f61e170a7404765ceb7229aac4582d
+EBUILD kguiaddons-5.104.0.ebuild 999 BLAKE2B 4bcd7e1b63f83edfbd3fe12675cddfbcd773f577472d1728530dfce424f1c78666225bb1749e3796b2a6df478a0e2f1d8fe4761c314cafa0bb555ed621d3043c SHA512 35a0f7b69f054776390d67f27803e434b2cf79d10b9079e1f622d6282dd6e9fd118ba583b350508e8b7546bf9c630c20d806161c2cb1251bb1bd738e5e40862c
 EBUILD kguiaddons-5.105.0.ebuild 1002 BLAKE2B 662ae41f5d7da92b40d61327bf3f8fbbdf69b90906f19837f6d92ce676aa2803ebf8d9f0d45efcddb85c93965a36d8277fa549f4faeff72f593843ccb4847a43 SHA512 6f7df88a7fea3f8280fa728fb9b0d4cd1cc21ff71ffe14a1f1cc69d295abc98722cc180fb9857385ecf95000c90ebe02b0f61e170a7404765ceb7229aac4582d
 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
deleted file mode 100644
index e8b157abebec..000000000000
--- a/kde-frameworks/kguiaddons/files/kguiaddons-5.102.0-fix-waylandclipboard.patch
+++ /dev/null
@@ -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
-
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild
deleted file mode 100644
index 2307f753f71b..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.102.0-r1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.104.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.104.0.ebuild
index 0bc0ffc751b5..453c9da1dc58 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.104.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.104.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="dbus wayland X"
 
 # slot op: includes qpa/qplatformnativeinterface.h