rpms/qt5-qtwayland
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use correct version of patch 044

Browse Source
This commit is contained in:
Jan Grulich 2022-02-11 12:19:10 +01:00
parent d7b0d9a62f
commit 6982ac0636
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt5-qtwayland.spec
View File

@ -58,7 +58,7 @@ Patch40: 0040-Client-Delay-deletion-of-QDrag-object-until-after-we.patch
Patch41: 0041-Client-Avoid-processing-of-events-when-showing-windo.patch Patch41: 0041-Client-Avoid-processing-of-events-when-showing-windo.patch
Patch42: 0042-Handle-registry_global-out-of-constructor.patch Patch42: 0042-Handle-registry_global-out-of-constructor.patch
Patch43: 0043-Connect-flushRequest-after-forceRoundTrip.patch Patch43: 0043-Connect-flushRequest-after-forceRoundTrip.patch
Patch44: 0044-Move-the-wayland-socket-polling-to-a-separate-event-2.patch Patch44: 0044-Move-the-wayland-socket-polling-to-a-separate-event-.patch
## rebased patch44 when patch43 is omitted -- rdieter ## rebased patch44 when patch43 is omitted -- rdieter
# Patch44: 0044-Move-the-wayland-socket-polling-to-a-separate-event-2.patch # Patch44: 0044-Move-the-wayland-socket-polling-to-a-separate-event-2.patch
Patch45: 0045-Check-pointer-for-null-before-use-in-ASSERT.patch Patch45: 0045-Check-pointer-for-null-before-use-in-ASSERT.patch

11
qtwayland-client-simplify-round-trip-behavior.patch
View File

@ -17,17 +17,17 @@ Change-Id: I650481f49a47ed1a9778c7e1bc3c48db6e8f0031
--- ---
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 5937172..414fe3f 100644 index 6f1bada..86045a3 100644
--- a/src/client/qwaylanddisplay.cpp --- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp
@@ -728,50 +728,9 @@ @@ -611,50 +611,9 @@ uint32_t QWaylandDisplay::currentTimeMillisec()
return 0; return 0;
} }
-static void -static void
-sync_callback(void *data, struct wl_callback *callback, uint32_t serial) -sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
-{ -{
- Q_UNUSED(serial); - Q_UNUSED(serial)
- bool *done = static_cast<bool *>(data); - bool *done = static_cast<bool *>(data);
- -
- *done = true; - *done = true;
@ -70,5 +70,6 @@ index 5937172..414fe3f 100644
- wl_callback_destroy(callback); - wl_callback_destroy(callback);
+ wl_display_roundtrip(mDisplay); + wl_display_roundtrip(mDisplay);
} }
bool QWaylandDisplay::supportsWindowDecoration() const bool QWaylandDisplay::supportsWindowDecoration() const