Accepting request 941642 from KDE:Qt:5.15

- Update to version 5.15.2+kde37:
  * Fix backport, context destruction was omitted
  * Client: do not empty clipboard when a new popup/window is opened
  * Wayland client: use wl_keyboard to determine active state
- Add patch to fix crashes triggered by unintentional actions when
  showing a window (kde#421700):
  * 0001-Client-Avoid-processing-of-events-when-showing-windo.patch

OBS-URL: https://build.opensuse.org/request/show/941642
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwayland?expand=0&rev=41
This commit is contained in:
Dominique Leuenberger 2021-12-21 17:40:18 +00:00 committed by Git OBS Bridge
commit e7f7121a0b
7 changed files with 61 additions and 10 deletions

View File

@ -0,0 +1,38 @@
From 68e9002161e2d0e3f33258887541de7abf4c507f Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Sun, 14 Nov 2021 13:54:19 +0000
Subject: [PATCH] Client: Avoid processing of events when showing windows
The only time we want to dispatch events from the wayland socket is when
the application is waiting for external events. Doing so at any other
time will cause unpredictable behavior in client code.
This caused a crash downstream where we had outputs get altered whilst
itterating through outputs, which shouldn't happen.
There is no benefit to flushing here, it won't make anything appear
faster as we haven't attached the buffer yet.
Change-Id: Ie13eae4012dab96a93d8810f468d1343402b8c28
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
(cherry picked from commit 46ed85a80b28d519cf5887bbdce55d1bf57886c3)
---
src/client/qwaylandwindow.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index ba881cb3..1597f67e 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -436,7 +436,6 @@ void QWaylandWindow::setVisible(bool visible)
if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
activePopups << this;
initWindow();
- mDisplay->flushRequests();
setGeometry(windowGeometry());
// Don't flush the events here, or else the newly visible window may start drawing, but since
--
2.33.1

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://invent.kde.org/qt/qt/qtwayland.git</param>
<param name="changesrevision">02f9585ca19c17ae0978b864195533dc527d825e</param></service></servicedata>
<param name="changesrevision">eb422ab5e07498a7a8d086f6a942ee35ab3c9776</param></service></servicedata>

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Dec 19 14:47:20 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to version 5.15.2+kde37:
* Fix backport, context destruction was omitted
* Client: do not empty clipboard when a new popup/window is opened
* Wayland client: use wl_keyboard to determine active state
- Add patch to fix crashes triggered by unintentional actions when
showing a window (kde#421700):
* 0001-Client-Avoid-processing-of-events-when-showing-windo.patch
-------------------------------------------------------------------
Thu Oct 28 07:16:50 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -26,7 +26,7 @@
%define so_version 5.15.2
%define tar_version qtwayland-everywhere-src-%{version}
Name: libqt5-qtwayland
Version: 5.15.2+kde34
Version: 5.15.2+kde37
Release: 0
Summary: Qt 5 Wayland Addon
# The wayland compositor files are GPL-3.0-or-later
@ -37,9 +37,11 @@ Source: %{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE
Patch1: 0001-Revert-Bump-version.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-Client-Avoid-processing-of-events-when-showing-windo.patch
BuildRequires: fdupes
BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version}
BuildRequires: libqt5-qtbase-private-headers-devel >= %{real_version}
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version}
BuildRequires: pkgconfig
BuildRequires: xz
BuildRequires: pkgconfig(egl)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79115123937c15d06d408bf0804e0fabf364dfced4abd614de917d0e0cdda5d4
size 4683276

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:371c656e8b4d93883883744a67139ba839692fc5a8355719b7a766bd25adce8e
size 4682252

View File

@ -1,5 +1,5 @@
name: qtwayland-everywhere-src
version: 5.15.2+kde34
mtime: 1634316933
commit: 02f9585ca19c17ae0978b864195533dc527d825e
version: 5.15.2+kde37
mtime: 1639067923
commit: eb422ab5e07498a7a8d086f6a942ee35ab3c9776