Import latest revisions

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwayland?expand=0&rev=19
This commit is contained in:
Christophe Giboudeaux 2022-01-22 20:32:10 +00:00 committed by Git OBS Bridge
parent 92a0ff63f6
commit d90e7386df
7 changed files with 22 additions and 48 deletions

View File

@ -1,38 +0,0 @@
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">eb422ab5e07498a7a8d086f6a942ee35ab3c9776</param></service></servicedata>
<param name="changesrevision">4644d51f4b52e83fc1b4d02b380d80d9d57e76fa</param></service></servicedata>

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jan 20 16:33:58 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to version 5.15.2+kde44:
* Move the wayland socket polling to a separate event thread
* Connect flushRequest after forceRoundTrip
* Handle registry_global out of constructor
* Client: Avoid processing of events when showing windows
* Client: Delay deletion of QDrag object until after we're done with it
* Client: Implement DataDeviceV3
* Set preedit cursor when cursor equals to 0
- Drop patches, now upstream:
* 0001-Client-Avoid-processing-of-events-when-showing-windo.patch
-------------------------------------------------------------------
Sun Dec 19 14:47:20 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+kde37
Version: 5.15.2+kde44
Release: 0
Summary: Qt 5 Wayland Addon
# The wayland compositor files are GPL-3.0-or-later
@ -37,8 +37,6 @@ 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 >= %{real_version}
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version}

View File

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

View File

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

View File

@ -1,5 +1,5 @@
name: qtwayland-everywhere-src
version: 5.15.2+kde37
mtime: 1639067923
commit: eb422ab5e07498a7a8d086f6a942ee35ab3c9776
version: 5.15.2+kde44
mtime: 1642608988
commit: 4644d51f4b52e83fc1b4d02b380d80d9d57e76fa