This commit is contained in:
Jan Grulich 2022-07-14 09:02:36 +02:00
parent d622cfc3a0
commit 6c31bca662
43 changed files with 183 additions and 146 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/qtwayland-everywhere-src-5.15.2.tar.xz
/qtwayland-everywhere-opensource-src-5.15.3.tar.xz
/qtwayland-everywhere-opensource-src-5.15.4.tar.xz
/qtwayland-everywhere-opensource-src-5.15.5.tar.xz

View File

@ -1,7 +1,7 @@
From eca0516905c3f88aba876d18742c9102da2319db Mon Sep 17 00:00:00 2001
From 03d56082a21894ff21e08042e21fed46dc0c69a3 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Wed, 5 May 2021 20:49:26 +0300
Subject: [PATCH 01/38] Client: Announce an output after receiving more
Subject: [PATCH 01/39] Client: Announce an output after receiving more
complete state
Output initialization is not atomic, meaning that the compositor may

View File

@ -1,7 +1,7 @@
From 95a139413337bb92a9dbbbd95f61e52cc1f43649 Mon Sep 17 00:00:00 2001
From 757fbedba864de49bae89b390be22031b06eec1a Mon Sep 17 00:00:00 2001
From: Jaeyoon Jung <jaeyoon.jung@lge.com>
Date: Mon, 15 Feb 2021 08:31:06 +0900
Subject: [PATCH 02/38] Fix issue with repeated window size changes
Subject: [PATCH 02/39] Fix issue with repeated window size changes
Check if the new window size is different from the size requested
previously before calling wl_egl_window_resize. It addresses the issue

View File

@ -1,7 +1,7 @@
From 58f7e6cfb61e4f170ab7ced2e01b6222036f934d Mon Sep 17 00:00:00 2001
From 162ac52924127add2ba1c14cef3b42a58a977243 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Tue, 9 Feb 2021 16:09:21 +0000
Subject: [PATCH 04/38] Client: Connect drags being accepted to updating the
Subject: [PATCH 03/39] Client: Connect drags being accepted to updating the
source drag icon
Currently in a multi-process drag and drop when the other client accepts

View File

@ -1,31 +0,0 @@
From 4f5bef9e6e0d16bb859e7a99ef5ebfca2ac93f45 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <albert.astals.cid@kdab.com>
Date: Mon, 10 May 2021 14:38:49 +0200
Subject: [PATCH 03/38] Include locale.h for setlocale/LC_CTYPE
Pick-to: 5.15
Change-Id: Iced32a31a63cec71008549c1e0961d59ffc45a37
Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
(cherry picked from commit e9522eda46028f351d87311d898ab985856970b0)
---
src/client/qwaylandinputcontext.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index ef5aa375..503fd735 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -51,6 +51,10 @@
#include "qwaylandinputmethodeventbuilder_p.h"
#include "qwaylandwindow_p.h"
+#if QT_CONFIG(xkbcommon)
+#include <locale.h>
+#endif
+
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(qLcQpaInputMethods, "qt.qpa.input.methods")
--
2.36.1

View File

@ -1,7 +1,7 @@
From 0b8b965626c7d02ce885187fa46fe6c69af3ede3 Mon Sep 17 00:00:00 2001
From f06ea86e2fb0ef601fb22109d5eebe246e009aff Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Fri, 14 May 2021 13:23:24 +0100
Subject: [PATCH 05/38] Client: Disconnect registry listener on destruction
Subject: [PATCH 04/39] Client: Disconnect registry listener on destruction
If a display outlives a QWaylandClientExtension and a new global is
announced we end up delivering an event to a now deleted extension which

View File

@ -1,7 +1,7 @@
From 71de867aab030a9f48bd73e4090d301da75e4102 Mon Sep 17 00:00:00 2001
From ed636d45ea1fb5e89a03492be7b6c22ead7c8713 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Mon, 3 May 2021 23:01:53 +0100
Subject: [PATCH 06/38] Client: Set XdgShell size hints before the first commit
Subject: [PATCH 05/39] Client: Set XdgShell size hints before the first commit
propagateSizeHints is only called in QWindow we have platform window and
minimumSizeHint is then sent. We also need to send existing hints when

View File

@ -1,7 +1,7 @@
From 342e5b7d0b45db4ed6679af4b40b05b4bd96de09 Mon Sep 17 00:00:00 2001
From 3ee59137a0f58e8ac36b94532476e9a60d24cf6c Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Mon, 14 Jun 2021 12:45:37 +0100
Subject: [PATCH 07/38] Fix build
Subject: [PATCH 06/39] Fix build
1b5e43a593e917610e6245f7a272ac081c508ba4 relied on a patch that we can't
backport.

View File

@ -1,7 +1,7 @@
From 7d6a8aa51603e39a5da5b87af2acd0433a265987 Mon Sep 17 00:00:00 2001
From 958ffd9ae97d17b630d2d30cfb9f309a9c313dc5 Mon Sep 17 00:00:00 2001
From: Zhang Liang <zhanglianga@uniontech.com>
Date: Mon, 1 Feb 2021 19:29:43 +0800
Subject: [PATCH 08/38] Fix: remove listener
Subject: [PATCH 07/39] Fix: remove listener
Add the operation for removing the listener form listener list

View File

@ -1,7 +1,7 @@
From bea49655add94c2ab77ec39dfe33bf6c7f5ce927 Mon Sep 17 00:00:00 2001
From 27869240e937e97a386b580a126246d0b064e7ce Mon Sep 17 00:00:00 2001
From: David Redondo <qt@david-redondo.de>
Date: Wed, 26 May 2021 14:49:40 +0200
Subject: [PATCH 09/38] Hook up queryKeyboardModifers
Subject: [PATCH 08/39] Hook up queryKeyboardModifers
Can be useful when upon enter a modifiers event is received but no key
event so no QKeyEvent is generated.

View File

@ -1,7 +1,7 @@
From c7022c1c0107781993b1d13e7aa11dd3f7486249 Mon Sep 17 00:00:00 2001
From 29289cca0c74104b61f6d201c392a41597e9a723 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 13 Jul 2021 13:32:15 +0200
Subject: [PATCH 10/38] Do not update the mask if we do not have a surface
Subject: [PATCH 09/39] Do not update the mask if we do not have a surface
mMask serves as a cache to remember what we've sent, the source of truth
for the value is window()->mask().

View File

@ -1,7 +1,7 @@
From 83a5e079e4bdf567010abc0b7d67eff052b76249 Mon Sep 17 00:00:00 2001
From 18d9848160962063d4735e5f15518f76936da692 Mon Sep 17 00:00:00 2001
From: Jan Blackquill <uhhadd@gmail.com>
Date: Tue, 24 Aug 2021 14:36:34 -0400
Subject: [PATCH 11/38] Correctly detect if image format is supported by
Subject: [PATCH 10/39] Correctly detect if image format is supported by
QImageWriter
The code queries potential image formats by stripping a mimetype of its

View File

@ -1,7 +1,7 @@
From 19d0878e56094b5cced1154ce07f566f2b147e2a Mon Sep 17 00:00:00 2001
From 67cdc477f2702c27fdc0a17b0385864891c7aaf3 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 14 Sep 2021 11:56:23 +0200
Subject: [PATCH 12/38] Wayland client: Fix crash when windows are shown/hidden
Subject: [PATCH 11/39] Wayland client: Fix crash when windows are shown/hidden
during drag
Fixes: QTBUG-87624

View File

@ -1,7 +1,7 @@
From abaa0b1765551533112944e624ac5989df7d7b6c Mon Sep 17 00:00:00 2001
From e26ccadfa921f64eca1e31450e60778d11867924 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <gbsneto@gnome.org>
Date: Thu, 27 May 2021 19:55:04 -0300
Subject: [PATCH 13/38] Client: Don't always recreate frame callbacks
Subject: [PATCH 12/39] Client: Don't always recreate frame callbacks
The main QWaylandWindow method that is executed when handling updates is
QWaylandWindow::handleUpdate(). This method always, unconditionally queues

View File

@ -1,7 +1,7 @@
From 1428e39b6e686faf4d25ab4f8506662bcc23e6f9 Mon Sep 17 00:00:00 2001
From e9b6a15c0677c7a1c6b93654b79be96880de9085 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <gbsneto@gnome.org>
Date: Thu, 27 May 2021 20:02:53 -0300
Subject: [PATCH 14/38] Client: Always destroy frame callback in the actual
Subject: [PATCH 13/39] Client: Always destroy frame callback in the actual
callback
It's good hygiene to destroy all frame callbacks. Destroy the

View File

@ -1,7 +1,7 @@
From 132be08e4d81c1e05b93f31a6e2b6a6bd65d5726 Mon Sep 17 00:00:00 2001
From 2ab9b543e24936b4950de6ee82336bc5ae99ef49 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey.pwns@gmail.com>
Date: Fri, 15 Oct 2021 12:55:33 -0400
Subject: [PATCH 15/38] Fix the logic for decoding modifiers map in Wayland
Subject: [PATCH 14/39] Fix the logic for decoding modifiers map in Wayland
text input protocol
Correctly check for the flags in the modifiers map when we get it from
@ -19,7 +19,7 @@ Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index 503fd735..e290baa2 100644
index 8b79c08f..84a34674 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -387,8 +387,10 @@ void QWaylandTextInput::zwp_text_input_v2_input_method_changed(uint32_t serial,

View File

@ -1,7 +1,7 @@
From f73a3ec466eb30e554f918d6d2da2c5d1b0e23bd Mon Sep 17 00:00:00 2001
From 441ede1cd5a43b4cb580bb916e1d20ba583080ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car@enioka.com>
Date: Wed, 18 Aug 2021 18:28:20 +0200
Subject: [PATCH 16/38] Wayland client: use wl_keyboard to determine active
Subject: [PATCH 15/39] Wayland client: use wl_keyboard to determine active
state
Commit f497a5bb87270174b8e0106b7eca1992d44ff15d made QWaylandDisplay

View File

@ -1,7 +1,7 @@
From 83440ae9e002f0c7bdec6b54db6b382d2e28bf7d Mon Sep 17 00:00:00 2001
From cc377a1dda41d4b668e2aa28b60788f026ef2b7b Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Fri, 16 Jul 2021 13:00:03 +0200
Subject: [PATCH 17/38] Client: do not empty clipboard when a new popup/window
Subject: [PATCH 16/39] Client: do not empty clipboard when a new popup/window
is opened
If we open a new popup or a window within the same app we have to avoid

View File

@ -1,7 +1,7 @@
From 1a476429c2d9034322d5b3366ce53375e484353a Mon Sep 17 00:00:00 2001
From 6c3e758f465642e2cb149ecac13e51cdad7c0365 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Sat, 18 Dec 2021 23:42:49 -0800
Subject: [PATCH 18/38] Set preedit cursor when cursor equals to 0
Subject: [PATCH 17/39] Set preedit cursor when cursor equals to 0
Pick-to: 6.3 6.2 5.15
Change-Id: I832fbb22d973b36ac4ab51570fc53bc2e4c3ed58

View File

@ -1,7 +1,7 @@
From 8afae71a44d0d5a0be477863da791dd2dfe2027d Mon Sep 17 00:00:00 2001
From 0d8986264ed9b3697b7abb845f603f4a652b2ff3 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Tue, 16 Feb 2021 09:51:47 +0000
Subject: [PATCH 19/38] Client: Implement DataDeviceV3
Subject: [PATCH 18/39] Client: Implement DataDeviceV3
DataDeviceV2 fixes a leak of DataDevice resources.

View File

@ -1,7 +1,7 @@
From e92aff243eca4c1e30c093692dce6f7c91d7a19c Mon Sep 17 00:00:00 2001
From 8c77607a4802eda5e108fedcdff392040266649c Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Thu, 18 Nov 2021 13:05:30 +0100
Subject: [PATCH 20/38] Client: Delay deletion of QDrag object until after
Subject: [PATCH 19/39] Client: Delay deletion of QDrag object until after
we're done with it
In certain cases, most notably when performing drag and drop operations

View File

@ -1,7 +1,7 @@
From 340e89575c93435abab78ac73603b405f1f05ceb Mon Sep 17 00:00:00 2001
From 67bad0273b36497269969d0f64635d918e4ce985 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Sun, 14 Nov 2021 13:54:19 +0000
Subject: [PATCH 21/38] Client: Avoid processing of events when showing windows
Subject: [PATCH 20/39] 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

View File

@ -1,7 +1,7 @@
From de7afd339100cac1470f875eafc22d3ee87870bd Mon Sep 17 00:00:00 2001
From 3e47c6b3f58772b2009ef6b1c71a82f387f6a648 Mon Sep 17 00:00:00 2001
From: Elvis Lee <kwangwoong.lee@lge.com>
Date: Thu, 18 Feb 2021 15:45:49 +0900
Subject: [PATCH 22/38] Handle registry_global out of constructor
Subject: [PATCH 21/39] Handle registry_global out of constructor
Factory functions in QWaylandDisplay::registry_global() can be overridden.
Later, other classes instantiated in the registry_global can support

View File

@ -1,7 +1,7 @@
From a5df6f67f446ed091c688336510b5da2970a0d84 Mon Sep 17 00:00:00 2001
From ec6027f0c9b15cd23d7a7b52235b1e39413cf835 Mon Sep 17 00:00:00 2001
From: Elvis Lee <kwangwoong.lee@lge.com>
Date: Wed, 17 Mar 2021 16:31:10 +0900
Subject: [PATCH 23/38] Connect flushRequest after forceRoundTrip
Subject: [PATCH 22/39] Connect flushRequest after forceRoundTrip
If flushRequest is connected with aboutToBlock, the flushRequest
may consumes all events so that processEvents might be blocked in forceRoundTrip.

View File

@ -1,7 +1,7 @@
From 967883d20e94183bd9cf6648297b9d76ba0e167e Mon Sep 17 00:00:00 2001
From ca8ebd4833a8f040f52e14b007d7eb3ecd6b0371 Mon Sep 17 00:00:00 2001
From: Adrien Faveraux <af@brain-networks.fr>
Date: Fri, 26 Nov 2021 09:18:58 +0100
Subject: [PATCH 24/38] Move the wayland socket polling to a separate event
Subject: [PATCH 23/39] Move the wayland socket polling to a separate event
thread
New event threads is introduced which calls poll() on the wayland fd,

View File

@ -1,7 +1,7 @@
From 520f58c24e0fbb33f84f329fc9879b72710c77ae Mon Sep 17 00:00:00 2001
From 10aa9f50861b6670cf9eb5e51725a8cc25c20aa7 Mon Sep 17 00:00:00 2001
From: Roman Genkhel <roman.genhel@lge.com>
Date: Thu, 12 Nov 2020 12:21:51 +0300
Subject: [PATCH 25/38] Check pointer for null before use in ASSERT
Subject: [PATCH 24/39] Check pointer for null before use in ASSERT
Task-number: QTBUG-85195
Change-Id: I331e54f6e58aa9d536351a55223610c60b3cb414

View File

@ -1,7 +1,7 @@
From 72f64f397c72afb22df1825382e17a310517add1 Mon Sep 17 00:00:00 2001
From a840317f050be717cf87e740a0201caf1c8b115d Mon Sep 17 00:00:00 2001
From: Inho Lee <inho.lee@qt.io>
Date: Mon, 1 Nov 2021 14:23:58 +0100
Subject: [PATCH 26/38] Do not create decorations when the shellSurface is not
Subject: [PATCH 25/39] Do not create decorations when the shellSurface is not
ready
A cases reported that client windows try to make decorations

View File

@ -1,7 +1,7 @@
From 6935647966b456e760745a6b2a13a04ba6543803 Mon Sep 17 00:00:00 2001
From 7daa34ec150141dcf090b4305d5d90c5a0696315 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Mon, 6 Jul 2020 14:37:35 +0200
Subject: [PATCH 27/38] Use wl_surface.damage_buffer on the client side
Subject: [PATCH 26/39] Use wl_surface.damage_buffer on the client side
Prefer the newer, recommended damage_buffer when the compositor
supports it.

View File

@ -1,7 +1,7 @@
From 506d0372178134f208fd08b3f6b9499fc0e14a5e Mon Sep 17 00:00:00 2001
From e9983ba23399ed03437d0f98e063896aa222c519 Mon Sep 17 00:00:00 2001
From: Joni Poikelin <joni.poikelin@qt.io>
Date: Thu, 3 Feb 2022 14:01:50 +0200
Subject: [PATCH 28/38] Fix crash if no input method module could be loaded
Subject: [PATCH 27/39] Fix crash if no input method module could be loaded
Pick-to: 6.2 6.3 5.15
Change-Id: I8f346def616606a6c5540856bd08a84ee7ed5ca2

View File

@ -1,7 +1,7 @@
From c2e56e076f0ded39b1ab34ebf07afad2f344f53f Mon Sep 17 00:00:00 2001
From ba8b58d4549c89f80c9ab914ec6024977c56c530 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Tue, 1 Feb 2022 13:05:36 +0200
Subject: [PATCH 29/38] Client: Remove mWaitingForUpdateDelivery
Subject: [PATCH 28/39] Client: Remove mWaitingForUpdateDelivery
Currently, mWaitingForUpdateDelivery is shared between the main thread
(doHandleFrameCallback()) and the frame callback event thread

View File

@ -1,7 +1,7 @@
From 2d0bd70b55ebde2e22d0b95e8122235f90c8f9f1 Mon Sep 17 00:00:00 2001
From a94d4c85fd8a969e93be836dd9d6829c5ca64347 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Tue, 8 Feb 2022 07:11:25 -0800
Subject: [PATCH 30/38] Cursor position == 0 should still show the cursor
Subject: [PATCH 29/39] Cursor position == 0 should still show the cursor
Otherwise the cursor would be hidden even if preedit is empty.
Amends 719a55be13bdadfa659a732755f280e276a894bd

View File

@ -1,7 +1,7 @@
From f0f7b2bea822f73ae00fcfd4ee1679596d550a20 Mon Sep 17 00:00:00 2001
From f6989471da98d774e106462d73d7c055cffa8280 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Wed, 22 Dec 2021 10:42:38 -0800
Subject: [PATCH 31/38] Update the preedit styling mapping
Subject: [PATCH 30/39] Update the preedit styling mapping
- None mapping to no style.
- Default/Underline mapping to underline.

View File

@ -1,7 +1,7 @@
From 596ecf46bb0c2427cda2894dd2157b3f5a2cd34f Mon Sep 17 00:00:00 2001
From a3a6f5258c61f41d4f2ba69386ae6f0f21e096db Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Wed, 9 Feb 2022 17:20:48 +0000
Subject: [PATCH 32/38] client: Simplify round trip behavior
Subject: [PATCH 31/39] client: Simplify round trip behavior
The custom event queue was removed in
302d4ffb8549214eb4028dc3e47ec4ee4e12ffbd (2015) so the comment about not

View File

@ -1,7 +1,7 @@
From f7b7b39d00ae31676fc678446d7090e7a9dd95b4 Mon Sep 17 00:00:00 2001
From a88efdaa9aa2ee7e5ce3cdb157ce4b52a18933a0 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Sat, 19 Feb 2022 17:01:04 +0200
Subject: [PATCH 33/38] Client: Fix opaque region setter
Subject: [PATCH 32/39] Client: Fix opaque region setter
The rect is in the global coordinate system, while the opaque region
must be in the surface local coordinate system.

View File

@ -1,7 +1,7 @@
From 6a95428357872353a20ab6dcc5f8facdb520e8dc Mon Sep 17 00:00:00 2001
From ea6c72c442a9f91cbdd5546530737fb5715aab83 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 4 Feb 2022 11:07:36 +0100
Subject: [PATCH 34/38] Use proper dependencies in compile tests
Subject: [PATCH 33/39] Use proper dependencies in compile tests
Use the dependencies as found by the "libraries" section instead of relying
on them being available in the default location (e.g. "-ldrm").

View File

@ -1,7 +1,7 @@
From 169052d99391eef62c181c8b5b107280688045d1 Mon Sep 17 00:00:00 2001
From b806f16d0508d52009d77884bd7cd2f377bce6bb Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Wed, 9 Mar 2022 10:47:42 +0100
Subject: [PATCH 35/38] client: update button state and etc in pointer_leave()
Subject: [PATCH 34/39] client: update button state and etc in pointer_leave()
The cleanup work needs to be done even the surface is null, for
example, a window was closed in mouse press handler, then will not

View File

@ -1,7 +1,7 @@
From 36756f5d1b8891465bddd31e990c81e149dce0f1 Mon Sep 17 00:00:00 2001
From 91ecab964af85adc2ad7998a2f7c38f89b67c07a Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 15 Mar 2022 15:59:15 +0100
Subject: [PATCH 36/38] Revert "Client: Remove mWaitingForUpdateDelivery"
Subject: [PATCH 35/39] Revert "Client: Remove mWaitingForUpdateDelivery"
The reverted commit introduces a severe performance regression
when a client window is resized while a QtQuick renderthread

View File

@ -1,7 +1,7 @@
From a83e65ddc9a965b25e435d136849a50f0b99c4ae Mon Sep 17 00:00:00 2001
From 72c608846ccb39a542d598d7b87ab709f38b969d Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 15 Mar 2022 16:53:04 +0100
Subject: [PATCH 37/38] Fix race condition on mWaitingForUpdateDelivery
Subject: [PATCH 36/39] Fix race condition on mWaitingForUpdateDelivery
Change-Id: I0e91bda73722468b9339fc434fe04420b5e7d3da
Reviewed-by: David Edmundson <davidedmundson@kde.org>

View File

@ -1,7 +1,7 @@
From 36659e6130ed3fc2b3f0c91423408ef5ecb7b991 Mon Sep 17 00:00:00 2001
From c9a24980b67a96c62e31eade65a254131fbef51d Mon Sep 17 00:00:00 2001
From: Kenneth Topp <ken@bllue.org>
Date: Mon, 4 Apr 2022 09:36:21 -0400
Subject: [PATCH 38/38] use poll(2) when reading from clipboard
Subject: [PATCH 37/39] use poll(2) when reading from clipboard
change clipboard read away from select(2) call which can fail when
an application has large number of open files

View File

@ -0,0 +1,31 @@
From 1e58585693eb337fc1c80e10987ed27115255d97 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 22 Feb 2022 12:31:08 +0100
Subject: [PATCH 38/39] Reduce memory leakage
We need to clean up the event queue when we're done.
Change-Id: I13a9eb77e978f4eab227a3a28dab8ebc8de94405
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 1264e5f565d8fb7ac200e4b00531ab876922458f)
---
src/client/qwaylanddisplay.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 86045a35..e8613ed8 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -379,6 +379,9 @@ QWaylandDisplay::~QWaylandDisplay(void)
#endif
if (mDisplay)
wl_display_disconnect(mDisplay);
+
+ if (m_frameEventQueue)
+ wl_event_queue_destroy(m_frameEventQueue);
}
// Steps which is called just after constructor. This separates registry_global() out of the constructor
--
2.36.1

View File

@ -0,0 +1,32 @@
From 64fa557eb30fc1219bec50a45107ea1a983411ed Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 18 Jun 2022 17:11:11 +0100
Subject: [PATCH 39/39] Fix build with libcxx (missing array include)
Bug: https://bugs.gentoo.org/833488
Task-number: QTBUG-104435
Change-Id: I06384761a5560b81b675e6c4ae498bb93dcb4f4f
Pick-to: 5.15 6.2 6.3 6.4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 5065013b0c2346b5918a2681ae2e58046140e8a7)
---
.../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
index 56a710c3..c6a8b6c6 100644
--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
@@ -41,6 +41,8 @@
#include <QtCore/QTextStream>
#include <QtGui/QOpenGLTexture>
+#include <array>
+
#include <EGL/egl.h>
#include <EGL/eglext.h>
--
2.36.1

View File

@ -2,7 +2,7 @@
Summary: Qt5 - Wayland platform support and QtCompositor module
Name: qt5-%{qt_module}
Version: 5.15.4
Version: 5.15.5
Release: 1%{?dist}
License: LGPLv3
@ -14,44 +14,45 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
## repo: https://invent.kde.org/qt/qt/qtwayland
## branch: kde/5.15
## git format-patch v5.15.4-lts-lgpl
Patch1: 0001-Client-Announce-an-output-after-receiving-more-compl.patch
Patch2: 0002-Fix-issue-with-repeated-window-size-changes.patch
Patch3: 0003-Include-locale.h-for-setlocale-LC_CTYPE.patch
Patch4: 0004-Client-Connect-drags-being-accepted-to-updating-the-.patch
Patch5: 0005-Client-Disconnect-registry-listener-on-destruction.patch
Patch6: 0006-Client-Set-XdgShell-size-hints-before-the-first-comm.patch
Patch7: 0007-Fix-build.patch
Patch8: 0008-Fix-remove-listener.patch
Patch9: 0009-Hook-up-queryKeyboardModifers.patch
Patch10: 0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch
Patch11: 0011-Correctly-detect-if-image-format-is-supported-by-QIm.patch
Patch12: 0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch
Patch13: 0013-Client-Don-t-always-recreate-frame-callbacks.patch
Patch14: 0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
Patch15: 0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
Patch16: 0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
Patch17: 0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
Patch18: 0018-Set-preedit-cursor-when-cursor-equals-to-0.patch
Patch19: 0019-Client-Implement-DataDeviceV3.patch
Patch20: 0020-Client-Delay-deletion-of-QDrag-object-until-after-we.patch
Patch21: 0021-Client-Avoid-processing-of-events-when-showing-windo.patch
Patch22: 0022-Handle-registry_global-out-of-constructor.patch
Patch23: 0023-Connect-flushRequest-after-forceRoundTrip.patch
Patch24: 0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
Patch25: 0025-Check-pointer-for-null-before-use-in-ASSERT.patch
Patch26: 0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
Patch27: 0027-Use-wl_surface.damage_buffer-on-the-client-side.patch
Patch28: 0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch
Patch29: 0029-Client-Remove-mWaitingForUpdateDelivery.patch
Patch30: 0030-Cursor-position-0-should-still-show-the-cursor.patch
Patch31: 0031-Update-the-preedit-styling-mapping.patch
Patch32: 0032-client-Simplify-round-trip-behavior.patch
Patch33: 0033-Client-Fix-opaque-region-setter.patch
Patch34: 0034-Use-proper-dependencies-in-compile-tests.patch
Patch35: 0035-client-update-button-state-and-etc-in-pointer_leave.patch
Patch36: 0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
Patch37: 0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
Patch38: 0038-use-poll-2-when-reading-from-clipboard.patch
Patch1: 0001-Client-Announce-an-output-after-receiving-more-compl.patch
Patch2: 0002-Fix-issue-with-repeated-window-size-changes.patch
Patch3: 0003-Client-Connect-drags-being-accepted-to-updating-the-.patch
Patch4: 0004-Client-Disconnect-registry-listener-on-destruction.patch
Patch5: 0005-Client-Set-XdgShell-size-hints-before-the-first-comm.patch
Patch6: 0006-Fix-build.patch
Patch7: 0007-Fix-remove-listener.patch
Patch8: 0008-Hook-up-queryKeyboardModifers.patch
Patch9: 0009-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch
Patch10: 0010-Correctly-detect-if-image-format-is-supported-by-QIm.patch
Patch11: 0011-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch
Patch12: 0012-Client-Don-t-always-recreate-frame-callbacks.patch
Patch13: 0013-Client-Always-destroy-frame-callback-in-the-actual-c.patch
Patch14: 0014-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
Patch15: 0015-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
Patch16: 0016-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
Patch17: 0017-Set-preedit-cursor-when-cursor-equals-to-0.patch
Patch18: 0018-Client-Implement-DataDeviceV3.patch
Patch19: 0019-Client-Delay-deletion-of-QDrag-object-until-after-we.patch
Patch20: 0020-Client-Avoid-processing-of-events-when-showing-windo.patch
Patch21: 0021-Handle-registry_global-out-of-constructor.patch
Patch22: 0022-Connect-flushRequest-after-forceRoundTrip.patch
Patch23: 0023-Move-the-wayland-socket-polling-to-a-separate-event-.patch
Patch24: 0024-Check-pointer-for-null-before-use-in-ASSERT.patch
Patch25: 0025-Do-not-create-decorations-when-the-shellSurface-is-n.patch
Patch26: 0026-Use-wl_surface.damage_buffer-on-the-client-side.patch
Patch27: 0027-Fix-crash-if-no-input-method-module-could-be-loaded.patch
Patch28: 0028-Client-Remove-mWaitingForUpdateDelivery.patch
Patch29: 0029-Cursor-position-0-should-still-show-the-cursor.patch
Patch30: 0030-Update-the-preedit-styling-mapping.patch
Patch31: 0031-client-Simplify-round-trip-behavior.patch
Patch32: 0032-Client-Fix-opaque-region-setter.patch
Patch33: 0033-Use-proper-dependencies-in-compile-tests.patch
Patch34: 0034-client-update-button-state-and-etc-in-pointer_leave.patch
Patch35: 0035-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
Patch36: 0036-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
Patch37: 0037-use-poll-2-when-reading-from-clipboard.patch
Patch38: 0038-Reduce-memory-leakage.patch
Patch39: 0039-Fix-build-with-libcxx-missing-array-include.patch
Patch50: 0050-Client-set-constraint-adjustments-for-popups-in-xdg.patch
@ -166,6 +167,9 @@ popd
%changelog
* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
- 5.15.5
* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
- 5.15.4

View File

@ -1 +1 @@
SHA512 (qtwayland-everywhere-opensource-src-5.15.4.tar.xz) = 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4
SHA512 (qtwayland-everywhere-opensource-src-5.15.5.tar.xz) = 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327