Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-wayland for openSUSE:Factory checked in at 2024-07-10 16:47:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old) and /work/SRC/openSUSE:Factory/.qt6-wayland.new.2080 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-wayland" Wed Jul 10 16:47:51 2024 rev:35 rq:1186345 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes 2024-06-24 20:50:20.205820761 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.2080/qt6-wayland.changes 2024-07-10 16:47:55.824125894 +0200 @@ -1,0 +2,6 @@ +Tue Jul 9 09:20:12 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix certain wayland protocol errors (kde#489259): + * 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch + +------------------------------------------------------------------- New: ---- 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch BETA DEBUG BEGIN: New:- Add patch to fix certain wayland protocol errors (kde#489259): * 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-wayland.spec ++++++ --- /var/tmp/diff_new_pack.W3WJws/_old 2024-07-10 16:47:56.404147191 +0200 +++ /var/tmp/diff_new_pack.W3WJws/_new 2024-07-10 16:47:56.404147191 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt6-wayland # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,10 +34,12 @@ Release: 0 Summary: Qt 6 Wayland libraries and tools # The wayland compositor files are GPL-3.0-or-later -License: GPL-3.0-or-later AND (LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-or-later) +License: GPL-3.0-or-later AND (GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-or-later) URL: https://www.qt.io Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-wayland-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch1: 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: qt6-gui-private-devel @@ -163,6 +165,7 @@ This package contains enabled features information shared by all the qt6-wayland libraries. + ### Private only libraries ### %package -n libQt6WaylandEglClientHwIntegration6 ++++++ 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch ++++++ >From 92bcb8f6b7a852c7a5d662fc34de561692a7a454 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii <vlad.zahorod...@kde.org> Date: Thu, 20 Jun 2024 11:25:06 +0300 Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface The last input window may not have a shell surface if it is a subsurface or that window has been just made invisible. Change-Id: Iad11c68659579429ddc5d9ba0038975b25da8e0d Reviewed-by: David Edmundson <davidedmund...@kde.org> (cherry picked from commit 52c406cec149634680489faeeaf06bb1258cd12f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_...@qt-project.org> (cherry picked from commit 7d04c18531276c94bfdf2f9a955d6f02554b28b2) --- src/client/qwaylandwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 22aeba10..c3725ffc 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const return mTopPopup; } - if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) - return display()->lastInputWindow(); + if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) { + if (auto lastInputWindow = display()->lastInputWindow()) + return closestShellSurfaceWindow(lastInputWindow->window()); + } return nullptr; } -- 2.45.2
