[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/, dev-qt/qtwayland/files/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     0aa9b8f7ecf8c493846309069c36f9e4b6d8c9d6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 15:40:36 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 16:15:18 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa9b8f7

dev-qt/qtwayland: drop 6.9.0-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtwayland/Manifest                          |  1 -
 .../files/qtwayland-6.9.0-reset-mframe.patch       | 60 ------------------
 dev-qt/qtwayland/qtwayland-6.9.0-r1.ebuild         | 71 ----------------------
 3 files changed, 132 deletions(-)

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 8d9069fbdfef..33ec29696463 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -4,5 +4,4 @@ DIST qtwayland-everywhere-opensource-src-5.15.16.tar.xz 561148 BLAKE2B a09505124
 DIST qtwayland-everywhere-opensource-src-5.15.17.tar.xz 563036 BLAKE2B e3cf9879cb80ca0c07cbe99bbb81fd01efd9c2f42cd03d3d8e4148db13a3e69aee0e644d71c68a798ef85cad874ef205ca5063724363b7a0d88d7879f5e02c11 SHA512 1b0fecff83f619c2c56b5b8894678a70288109e6146d0672086ce105a7916a4ad6dca83aa3d6601d2e3b05c7f271a2ac403762096246461eb1f203d02eb4e192
 DIST qtwayland-everywhere-src-6.8.2.tar.xz 1138764 BLAKE2B a2311698c23d00e81dff3b2e7140dc5cd2c2006c713d2e777fc032a407ca393914f0a68a92d1c7e3ccdb668d498fa10a67d61e4419eb341705678b843149ec89 SHA512 b11a2a9189939b9deb000d6dc517242290fbba228e4a0bb2c5097c20aac79431b1398d940ed145a9fd308ae73605dd7df6cf89643de92c158b7ae92a948db954
 DIST qtwayland-everywhere-src-6.8.3.tar.xz 1141132 BLAKE2B 0a1a8b1bba5d1ad398943820c8375777a71ef3d00d48a6569708950d2dcffe7ee7f99bbbfdf4431264b0c0f75e2e3668b3d60269d90f6f7cbb6ce46dccacedae SHA512 2edb6d3e85c06bcf689c3acfcc38b6ff0505569dfeec8bfb5a434fad563087ff917875ea56e639405af3cca8adc98206ab9f68dfaf8e2449300d010ffbb16699
-DIST qtwayland-everywhere-src-6.9.0.tar.xz 1152368 BLAKE2B 80ac81020389719dd8ccd5abd9a1979b3b82a8b8b5a2d4e9befa478b3b304e1b791a449ac131f36e06f455ae1b3872ad87feb4660aebc1407c82da7f7d80d01e SHA512 a5e8af98030030b34f644bb963d8e901017c17e21f892bdd2d99ddbe9664a1798f6e216d4f56f748a143983c1565a7f40900059facc623409fa6098f34d0c1c7
 DIST qtwayland-everywhere-src-6.9.1.tar.xz 1152868 BLAKE2B dc67c221a430b4ae3cbffa1d48d56955fac2efa32d572a7456b398017af6a8c976e5fd26104236bed2cac1ec0149bb389b1a2872ae5874862197833b21c38030 SHA512 1647087d695dccbc2b0edd07dc6ea36c22317394ec3b87993938124057d0cf2bbc84eee560ea59e7b2bffeaf8be79d56458f5ba309e36c5ebcf0c738f317b7b7

diff --git a/dev-qt/qtwayland/files/qtwayland-6.9.0-reset-mframe.patch b/dev-qt/qtwayland/files/qtwayland-6.9.0-reset-mframe.patch
deleted file mode 100644
index bad4ad4e329a..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-6.9.0-reset-mframe.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Backport recommended by KDE[1].
-
-[1] https://invent.kde.org/qt/qt/qtwayland/-/commit/e4556c59f0c8250da7c16759432b2ac0a5ac9d9f
-[2] https://mail.kde.org/pipermail/distributions/2025-April/001575.html
-From e4556c59f0c8250da7c16759432b2ac0a5ac9d9f Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Mon, 31 Mar 2025 11:40:12 +0300
-Subject: [PATCH] Client: Reset mFrameCallbackTimedOut when showing a window
-
-When a window is hidden, the corresponding expose event is sent
-asynchronously. So, a buffer (and a frame callback) can be attached
-after the window is hidden.
-
-QWaylandWindow::initWindow() handles that case by attaching a nil buffer
-to the surface, but it skips resetting the frame callback things.
-
-If mFrameCallbackTimedOut is not reset, then the window can get stuck
-in the unexposed state and not show up after the second setVisible(true).
-
-This change makes the initWindow() function also reset frame callback
-data. It fixes some windows not showing up after remapping them.
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -107,4 +107,5 @@
-     mSurface->attach(nullptr, 0, 0);
-     mSurface->commit();
-+    resetFrameCallback();
- 
-     if (window()->type() == Qt::Desktop)
-@@ -326,4 +327,13 @@
-     delete std::exchange(mSubSurfaceWindow, nullptr);
-     emit surfaceRoleDestroyed();
-+
-+    resetFrameCallback();
-+    mInFrameRender = false;
-+    mWaitingToApplyConfigure = false;
-+    mExposed = false;
-+}
-+
-+void QWaylandWindow::resetFrameCallback()
-+{
-     {
-         QMutexLocker lock(&mFrameSyncMutex);
-@@ -339,8 +349,5 @@
-         mFrameCallbackCheckIntervalTimerId = -1;
-     }
--    mInFrameRender = false;
-     mFrameCallbackTimedOut = false;
--    mWaitingToApplyConfigure = false;
--    mExposed = false;
- }
- 
---- a/src/client/qwaylandwindow_p.h
-+++ b/src/client/qwaylandwindow_p.h
-@@ -352,4 +352,5 @@
-     bool shouldCreateSubSurface() const;
-     void resetSurfaceRole();
-+    void resetFrameCallback();
-     QPlatformScreen *calculateScreenFromSurfaceEvents() const;
-     void setOpaqueArea(const QRegion &opaqueArea);

diff --git a/dev-qt/qtwayland/qtwayland-6.9.0-r1.ebuild b/dev-qt/qtwayland/qtwayland-6.9.0-r1.ebuild
deleted file mode 100644
index ef9a53788591..000000000000
--- a/dev-qt/qtwayland/qtwayland-6.9.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-IUSE="accessibility compositor gnome qml vulkan"
-
-RDEPEND="
-	dev-libs/wayland
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland]
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-	compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-	)
-	gnome? (
-		~dev-qt/qtbase-${PV}:6[dbus]
-		~dev-qt/qtsvg-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="dev-util/wayland-scanner"
-
-CMAKE_SKIP_TESTS=(
-	# segfaults for not-looked-into reasons, but not considered
-	# an issue given >=seatv5 exists since wayland-1.10 (2016)
-	tst_seatv4
-	# needs a compositor/opengl, skip the extra trouble
-	tst_surface
-	tst_xdgdecorationv1
-	# known failing with wayland-1.23.0 (or at least with offscreen), not
-	# believed to result in critical runtime issues so skip until this is
-	# looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379)
-	tst_client
-	tst_compositor
-	tst_scaling
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-reset-mframe.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package compositor Qt6Quick)
-		$(cmake_use_find_package qml Qt6Quick)
-		$(qt_feature compositor wayland_server)
-		$(qt_feature gnome wayland_decoration_adwaita)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	# users' session setting may break tst_clientextension (bug #927030)
-	unset DESKTOP_SESSION XDG_CURRENT_DESKTOP
-	unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION
-
-	qt6-build_src_test
-}