[neon/qt/qtwayland/Neon/unstable] debian: Refresh other patches.
Dmitry Shachnev
null at kde.org
Mon Apr 29 17:44:39 BST 2024
Git commit 355b9bfa94fc1610b9d31695e1803f0921f69d14 by Dmitry Shachnev.
Committed on 10/09/2022 at 19:00.
Pushed by jriddell into branch 'Neon/unstable'.
Refresh other patches.
M +1 -0 debian/changelog
M +2 -2 debian/patches/0013-Client-Don-t-always-recreate-frame-callbacks.patch
M +3 -3 debian/patches/0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
M +2 -2 debian/patches/0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
M +2 -2 debian/patches/0021-Client-Avoid-processing-of-events-when-showing-windo.patch
M +7 -7 debian/patches/0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
M +6 -2 debian/patches/0025-Check-pointer-for-null-before-use-in-ASSERT.patch
M +2 -2 debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
M +6 -6 debian/patches/0027-Use-wl_surface.damage_buffer-on-the-client-side.patch
M +2 -2 debian/patches/0029-Client-Remove-mWaitingForUpdateDelivery.patch
M +2 -2 debian/patches/0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
M +2 -2 debian/patches/0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
https://invent.kde.org/neon/qt/qtwayland/-/commit/355b9bfa94fc1610b9d31695e1803f0921f69d14
diff --git a/debian/changelog b/debian/changelog
index fb6ebe2..b36ad17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwayland-opensource-src (5.15.6-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop 0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch,
included in the new release.
+ * Refresh other patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 10 Sep 2022 21:36:17 +0300
diff --git a/debian/patches/0013-Client-Don-t-always-recreate-frame-callbacks.patch b/debian/patches/0013-Client-Don-t-always-recreate-frame-callbacks.patch
index 0e7f926..3120ab0 100644
--- a/debian/patches/0013-Client-Don-t-always-recreate-frame-callbacks.patch
+++ b/debian/patches/0013-Client-Don-t-always-recreate-frame-callbacks.patch
@@ -1,4 +1,4 @@
-From abaa0b1765551533112944e624ac5989df7d7b6c Mon Sep 17 00:00:00 2001
+From aa701858908ced79f5ebe4f30907ebbe7566e238 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <gbsneto at gnome.org>
Date: Thu, 27 May 2021 19:55:04 -0300
Subject: [PATCH] Client: Don't always recreate frame callbacks
@@ -39,7 +39,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -1170,6 +1170,10 @@ void QWaylandWindow::requestUpdate()
+@@ -1185,6 +1185,10 @@ void QWaylandWindow::requestUpdate()
void QWaylandWindow::handleUpdate()
{
qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread();
diff --git a/debian/patches/0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch b/debian/patches/0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
index 1359e27..910c086 100644
--- a/debian/patches/0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
+++ b/debian/patches/0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
@@ -1,4 +1,4 @@
-From 1428e39b6e686faf4d25ab4f8506662bcc23e6f9 Mon Sep 17 00:00:00 2001
+From b9f26b7d68a39785f5bf4dbe165dcc6bec8ac144 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <gbsneto at gnome.org>
Date: Thu, 27 May 2021 20:02:53 -0300
Subject: [PATCH] Client: Always destroy frame callback in the actual callback
@@ -23,7 +23,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -622,9 +622,13 @@ void QWaylandWindow::commit()
+@@ -635,9 +635,13 @@ void QWaylandWindow::commit()
const wl_callback_listener QWaylandWindow::callbackListener = {
[](void *data, wl_callback *callback, uint32_t time) {
@@ -38,7 +38,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
window->handleFrameCallback();
}
};
-@@ -1179,11 +1183,6 @@ void QWaylandWindow::handleUpdate()
+@@ -1194,11 +1198,6 @@ void QWaylandWindow::handleUpdate()
if (!mSurface)
return;
diff --git a/debian/patches/0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch b/debian/patches/0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
index 3504642..f707007 100644
--- a/debian/patches/0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
+++ b/debian/patches/0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
@@ -1,4 +1,4 @@
-From f73a3ec466eb30e554f918d6d2da2c5d1b0e23bd Mon Sep 17 00:00:00 2001
+From 63d06271d40e53ab27457d891e7811e5ba481973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car at enioka.com>
Date: Wed, 18 Aug 2021 18:28:20 +0200
Subject: [PATCH] Wayland client: use wl_keyboard to determine active state
@@ -108,7 +108,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
}
QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
-@@ -1083,10 +1084,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
+@@ -1098,10 +1099,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
return true;
}
diff --git a/debian/patches/0021-Client-Avoid-processing-of-events-when-showing-windo.patch b/debian/patches/0021-Client-Avoid-processing-of-events-when-showing-windo.patch
index 65be7aa..762f1d0 100644
--- a/debian/patches/0021-Client-Avoid-processing-of-events-when-showing-windo.patch
+++ b/debian/patches/0021-Client-Avoid-processing-of-events-when-showing-windo.patch
@@ -1,4 +1,4 @@
-From 340e89575c93435abab78ac73603b405f1f05ceb Mon Sep 17 00:00:00 2001
+From d9324566b1c47a9feada7c10105a5cefb49f8683 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson at kde.org>
Date: Sun, 14 Nov 2021 13:54:19 +0000
Subject: [PATCH] Client: Avoid processing of events when showing windows
@@ -23,7 +23,7 @@ Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -436,7 +436,6 @@ void QWaylandWindow::setVisible(bool visible)
+@@ -437,7 +437,6 @@ void QWaylandWindow::setVisible(bool visible)
if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
activePopups << this;
initWindow();
diff --git a/debian/patches/0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch b/debian/patches/0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
index 2fef5ce..8ced7be 100644
--- a/debian/patches/0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
+++ b/debian/patches/0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
@@ -1,4 +1,4 @@
-From 967883d20e94183bd9cf6648297b9d76ba0e167e Mon Sep 17 00:00:00 2001
+From cb887d58bdf4f685f0a1f226bfbc3b2806d8ca17 Mon Sep 17 00:00:00 2001
From: Adrien Faveraux <af at brain-networks.fr>
Date: Fri, 26 Nov 2021 09:18:58 +0100
Subject: [PATCH] Move the wayland socket polling to a separate event thread
@@ -469,7 +469,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
delete mWindowDecoration;
if (mSurface)
-@@ -635,6 +632,8 @@ const wl_callback_listener QWaylandWindow::callbackListener = {
+@@ -648,6 +645,8 @@ const wl_callback_listener QWaylandWindow::callbackListener = {
void QWaylandWindow::handleFrameCallback()
{
@@ -478,7 +478,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
mWaitingForFrameCallback = false;
mFrameCallbackElapsedTimer.invalidate();
-@@ -656,12 +655,16 @@ void QWaylandWindow::handleFrameCallback()
+@@ -669,12 +668,16 @@ void QWaylandWindow::handleFrameCallback()
mWaitingForUpdateDelivery = true;
QMetaObject::invokeMethod(this, doHandleExpose, Qt::QueuedConnection);
}
@@ -497,7 +497,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
if (mWaitingForFrameCallback) {
qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
-@@ -1157,8 +1160,11 @@ void QWaylandWindow::requestUpdate()
+@@ -1172,8 +1175,11 @@ void QWaylandWindow::requestUpdate()
Q_ASSERT(hasPendingUpdateRequest()); // should be set by QPA
// If we have a frame callback all is good and will be taken care of there
@@ -511,7 +511,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
// If we've already called deliverUpdateRequest(), but haven't seen any attach+commit/swap yet
// This is a somewhat redundant behavior and might indicate a bug in the calling code, so log
-@@ -1171,7 +1177,12 @@ void QWaylandWindow::requestUpdate()
+@@ -1186,7 +1192,12 @@ void QWaylandWindow::requestUpdate()
// so use invokeMethod to delay the delivery a bit.
QMetaObject::invokeMethod(this, [this] {
// Things might have changed in the meantime
@@ -525,7 +525,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
deliverUpdateRequest();
}, Qt::QueuedConnection);
}
-@@ -1191,9 +1202,10 @@ void QWaylandWindow::handleUpdate()
+@@ -1206,9 +1217,10 @@ void QWaylandWindow::handleUpdate()
if (!mSurface)
return;
@@ -538,7 +538,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
mFrameCallback = wl_surface_frame(wrappedSurface);
wl_proxy_wrapper_destroy(wrappedSurface);
wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this);
-@@ -1203,6 +1215,8 @@ void QWaylandWindow::handleUpdate()
+@@ -1218,6 +1230,8 @@ void QWaylandWindow::handleUpdate()
// Start a timer for handling the case when the compositor stops sending frame callbacks.
if (mFrameCallbackTimeout > 0) {
QMetaObject::invokeMethod(this, [this] {
diff --git a/debian/patches/0025-Check-pointer-for-null-before-use-in-ASSERT.patch b/debian/patches/0025-Check-pointer-for-null-before-use-in-ASSERT.patch
index e069641..4a11a97 100644
--- a/debian/patches/0025-Check-pointer-for-null-before-use-in-ASSERT.patch
+++ b/debian/patches/0025-Check-pointer-for-null-before-use-in-ASSERT.patch
@@ -1,4 +1,4 @@
-From 520f58c24e0fbb33f84f329fc9879b72710c77ae Mon Sep 17 00:00:00 2001
+From bada05134c79c9aa35ce898ec294e11a2aff949a Mon Sep 17 00:00:00 2001
From: Roman Genkhel <roman.genhel at lge.com>
Date: Thu, 12 Nov 2020 12:21:51 +0300
Subject: [PATCH] Check pointer for null before use in ASSERT
@@ -13,11 +13,15 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -552,8 +552,8 @@ void QWaylandWindow::sendRecursiveExposeEvent()
+@@ -536,12 +536,12 @@ void QWaylandWindow::sendRecursiveExposeEvent()
void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
{
- Q_ASSERT(!buffer->committed());
+ QReadLocker locker(&mSurfaceLock);
+ if (mSurface == nullptr)
+ return;
+
if (buffer) {
+ Q_ASSERT(!buffer->committed());
handleUpdate();
diff --git a/debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch b/debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
index 48785cf..a657bd0 100644
--- a/debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
+++ b/debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
@@ -1,4 +1,4 @@
-From 72f64f397c72afb22df1825382e17a310517add1 Mon Sep 17 00:00:00 2001
+From 1480fda6ab4a23debd2d1a75d0e8f6c851255441 Mon Sep 17 00:00:00 2001
From: Inho Lee <inho.lee at qt.io>
Date: Mon, 1 Nov 2021 14:23:58 +0100
Subject: [PATCH] Do not create decorations when the shellSurface is not ready
@@ -22,7 +22,7 @@ Reviewed-by: Paul Olav Tvete <paul.tvete at qt.io>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -813,7 +813,7 @@ bool QWaylandWindow::createDecoration()
+@@ -828,7 +828,7 @@ bool QWaylandWindow::createDecoration()
decoration = false;
if (mSubSurfaceWindow)
decoration = false;
diff --git a/debian/patches/0027-Use-wl_surface.damage_buffer-on-the-client-side.patch b/debian/patches/0027-Use-wl_surface.damage_buffer-on-the-client-side.patch
index 9f100f9..c6691ac 100644
--- a/debian/patches/0027-Use-wl_surface.damage_buffer-on-the-client-side.patch
+++ b/debian/patches/0027-Use-wl_surface.damage_buffer-on-the-client-side.patch
@@ -1,4 +1,4 @@
-From 6935647966b456e760745a6b2a13a04ba6543803 Mon Sep 17 00:00:00 2001
+From 5972e1c4eccb1baf89d6cf779925eb35a49a8d2d Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete at qt.io>
Date: Mon, 6 Jul 2020 14:37:35 +0200
Subject: [PATCH] Use wl_surface.damage_buffer on the client side
@@ -21,7 +21,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
-@@ -488,7 +488,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
+@@ -491,7 +491,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
if (interface == QStringLiteral("wl_output")) {
mWaitingScreens << new QWaylandScreen(this, version, id);
} else if (interface == QStringLiteral("wl_compositor")) {
@@ -32,10 +32,10 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
mShm.reset(new QWaylandShm(this, version, id));
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -571,7 +571,11 @@ void QWaylandWindow::attachOffset(QWaylandBuffer *buffer)
+@@ -563,7 +563,11 @@ void QWaylandWindow::damage(const QRect &rect)
+ if (mSurface == nullptr)
+ return;
- void QWaylandWindow::damage(const QRect &rect)
- {
- mSurface->damage(rect.x(), rect.y(), rect.width(), rect.height());
+ const int s = scale();
+ if (mDisplay->compositorVersion() >= 4)
@@ -45,7 +45,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
}
void QWaylandWindow::safeCommit(QWaylandBuffer *buffer, const QRegion &damage)
-@@ -605,8 +609,14 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
+@@ -599,8 +603,14 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
return;
attachOffset(buffer);
diff --git a/debian/patches/0029-Client-Remove-mWaitingForUpdateDelivery.patch b/debian/patches/0029-Client-Remove-mWaitingForUpdateDelivery.patch
index 6b923c4..abaf427 100644
--- a/debian/patches/0029-Client-Remove-mWaitingForUpdateDelivery.patch
+++ b/debian/patches/0029-Client-Remove-mWaitingForUpdateDelivery.patch
@@ -1,4 +1,4 @@
-From c2e56e076f0ded39b1ab34ebf07afad2f344f53f Mon Sep 17 00:00:00 2001
+From d45289232b887bad6157bb53caaa8244ee4df9e1 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii at kde.org>
Date: Tue, 1 Feb 2022 13:05:36 +0200
Subject: [PATCH] Client: Remove mWaitingForUpdateDelivery
@@ -24,7 +24,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -648,23 +648,18 @@ void QWaylandWindow::handleFrameCallback()
+@@ -651,23 +651,18 @@ void QWaylandWindow::handleFrameCallback()
mFrameCallbackElapsedTimer.invalidate();
// The rest can wait until we can run it on the correct thread
diff --git a/debian/patches/0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch b/debian/patches/0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
index fbcc03a..5bdb6c6 100644
--- a/debian/patches/0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
+++ b/debian/patches/0036-Revert-Client-Remove-mWaitingForUpdateDelivery.patch
@@ -1,4 +1,4 @@
-From 36756f5d1b8891465bddd31e990c81e149dce0f1 Mon Sep 17 00:00:00 2001
+From 29a5701dd1ac110af8a2b20a92fd1e09f8299861 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete at qt.io>
Date: Tue, 15 Mar 2022 15:59:15 +0100
Subject: [PATCH] Revert "Client: Remove mWaitingForUpdateDelivery"
@@ -19,7 +19,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -655,11 +655,17 @@ void QWaylandWindow::handleFrameCallback()
+@@ -658,11 +658,17 @@ void QWaylandWindow::handleFrameCallback()
sendExposeEvent(QRect(QPoint(), geometry().size()));
if (wasExposed && hasPendingUpdateRequest())
deliverUpdateRequest();
diff --git a/debian/patches/0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch b/debian/patches/0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
index c9f9abf..ae1aeb2 100644
--- a/debian/patches/0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
+++ b/debian/patches/0037-Fix-race-condition-on-mWaitingForUpdateDelivery.patch
@@ -1,4 +1,4 @@
-From a83e65ddc9a965b25e435d136849a50f0b99c4ae Mon Sep 17 00:00:00 2001
+From f1a4832a2db60af2110ffe4cdf9589cc06da4f59 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete at qt.io>
Date: Tue, 15 Mar 2022 16:53:04 +0100
Subject: [PATCH] Fix race condition on mWaitingForUpdateDelivery
@@ -12,7 +12,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
-@@ -649,24 +649,21 @@ void QWaylandWindow::handleFrameCallback()
+@@ -652,24 +652,21 @@ void QWaylandWindow::handleFrameCallback()
// The rest can wait until we can run it on the correct thread
auto doHandleExpose = [this]() {
More information about the Neon-commits
mailing list