[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 807a4f5d6740cf94bdfcb6653c846f145442c57c by Dmitry Shachnev.
Committed on 22/04/2023 at 14:55.
Pushed by jriddell into branch 'Neon/unstable'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +3    -3    debian/patches/0002-Fix-issue-with-repeated-window-size-changes.patch
M  +2    -2    debian/patches/0008-Fix-remove-listener.patch
M  +2    -2    debian/patches/0013-Client-Don-t-always-recreate-frame-callbacks.patch
M  +2    -2    debian/patches/0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
M  +5    -5    debian/patches/0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
M  +3    -3    debian/patches/0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
M  +2    -2    debian/patches/0019-Client-Implement-DataDeviceV3.patch
M  +4    -4    debian/patches/0022-Handle-registry_global-out-of-constructor.patch
M  +14   -14   debian/patches/0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
M  +2    -2    debian/patches/0032-client-Simplify-round-trip-behavior.patch
M  +2    -2    debian/patches/0039-Reduce-memory-leakage.patch
M  +6    -6    debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
M  +2    -2    debian/patches/0044-Use-wl_surface.damage_buffer-on-the-client-side.patch
M  +2    -2    debian/patches/0045-Client-clear-focus-on-touch-cancel.patch
M  +2    -2    debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
M  +3    -3    debian/patches/0054-Hold-surface-read-lock-throughout-QWaylandEglWindow-.patch
M  +3    -3    debian/patches/0062-Client-Handle-zwp_primary_selection_device_manager_v.patch

https://invent.kde.org/neon/qt/qtwayland/-/commit/807a4f5d6740cf94bdfcb6653c846f145442c57c

diff --git a/debian/changelog b/debian/changelog
index be090ab..1cd7933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtwayland-opensource-src (5.15.9-1) UNRELEASED; urgency=medium
     - 0035-client-update-button-state-and-etc-in-pointer_leave.patch
     - 0050-Fix-missing-update-when-toggling-client-side-decorat.patch
     - 0052-Client-support-high-dpi-mode-for-window-icon.patch
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Apr 2023 16:58:13 +0300
 
diff --git a/debian/patches/0002-Fix-issue-with-repeated-window-size-changes.patch b/debian/patches/0002-Fix-issue-with-repeated-window-size-changes.patch
index 120d218..eeb0225 100644
--- a/debian/patches/0002-Fix-issue-with-repeated-window-size-changes.patch
+++ b/debian/patches/0002-Fix-issue-with-repeated-window-size-changes.patch
@@ -1,4 +1,4 @@
-From 95a139413337bb92a9dbbbd95f61e52cc1f43649 Mon Sep 17 00:00:00 2001
+From a9bcc5dc553b5a307a5bdcb6e1d92058e0257c7c Mon Sep 17 00:00:00 2001
 From: Jaeyoon Jung <jaeyoon.jung at lge.com>
 Date: Mon, 15 Feb 2021 08:31:06 +0900
 Subject: [PATCH] Fix issue with repeated window size changes
@@ -21,7 +21,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 
 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
 +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-@@ -131,14 +131,16 @@ void QWaylandEglWindow::updateSurface(bool create)
+@@ -122,14 +122,16 @@ void QWaylandEglWindow::updateSurface(bool create)
              if (!disableResizeCheck) {
                  wl_egl_window_get_attached_size(m_waylandEglWindow, &current_width, &current_height);
              }
@@ -41,7 +41,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
          if (!m_eglSurface && m_waylandEglWindow && create) {
 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
 +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
-@@ -88,6 +88,7 @@ private:
+@@ -87,6 +87,7 @@ private:
      mutable QOpenGLFramebufferObject *m_contentFBO = nullptr;
  
      QSurfaceFormat m_format;
diff --git a/debian/patches/0008-Fix-remove-listener.patch b/debian/patches/0008-Fix-remove-listener.patch
index 7fa56b5..fc263bb 100644
--- a/debian/patches/0008-Fix-remove-listener.patch
+++ b/debian/patches/0008-Fix-remove-listener.patch
@@ -1,4 +1,4 @@
-From 7d6a8aa51603e39a5da5b87af2acd0433a265987 Mon Sep 17 00:00:00 2001
+From 418580420c34c1a81fd5a4d872e41dc467c124d0 Mon Sep 17 00:00:00 2001
 From: Zhang Liang <zhanglianga at uniontech.com>
 Date: Mon, 1 Feb 2021 19:29:43 +0800
 Subject: [PATCH] Fix: remove listener
@@ -14,7 +14,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -452,9 +452,10 @@ void QWaylandDisplay::addRegistryListener(RegistryListener listener, void *data)
+@@ -456,9 +456,10 @@ void QWaylandDisplay::addRegistryListener(RegistryListener listener, void *data)
  
  void QWaylandDisplay::removeListener(RegistryListener listener, void *data)
  {
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 3120ab0..ae9ee8b 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 aa701858908ced79f5ebe4f30907ebbe7566e238 Mon Sep 17 00:00:00 2001
+From 3bb880d6b828f934f69608af958963c9eedc4e74 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
-@@ -1185,6 +1185,10 @@ void QWaylandWindow::requestUpdate()
+@@ -1192,6 +1192,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 910c086..a361517 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 b9f26b7d68a39785f5bf4dbe165dcc6bec8ac144 Mon Sep 17 00:00:00 2001
+From a0ab21120ae0d0976d1c554aa72f00d4b3d35de9 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
@@ -38,7 +38,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
          window->handleFrameCallback();
      }
  };
-@@ -1194,11 +1198,6 @@ void QWaylandWindow::handleUpdate()
+@@ -1201,11 +1205,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 f707007..9efdd19 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 63d06271d40e53ab27457d891e7811e5ba481973 Mon Sep 17 00:00:00 2001
+From d40acfcc33ae9f8d105f196d1af03a640a02db0b 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
@@ -46,7 +46,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -575,14 +575,10 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic
+@@ -579,14 +579,10 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic
      if (mLastKeyboardFocus == keyboardFocus)
          return;
  
@@ -65,7 +65,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  
      mLastKeyboardFocus = keyboardFocus;
  }
-@@ -627,6 +623,13 @@ QWaylandInputDevice *QWaylandDisplay::defaultInputDevice() const
+@@ -631,6 +627,13 @@ QWaylandInputDevice *QWaylandDisplay::defaultInputDevice() const
      return mInputDevices.isEmpty() ? 0 : mInputDevices.first();
  }
  
@@ -81,7 +81,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  QWaylandCursor *QWaylandDisplay::waylandCursor()
 --- a/src/client/qwaylanddisplay_p.h
 +++ b/src/client/qwaylanddisplay_p.h
-@@ -215,6 +215,7 @@ public:
+@@ -219,6 +219,7 @@ public:
      void destroyFrameQueue(const FrameQueue &q);
      void dispatchQueueWhile(wl_event_queue *queue, std::function<bool()> condition, int timeout = -1);
  
@@ -108,7 +108,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  }
  
  QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
-@@ -1098,10 +1099,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
+@@ -1105,10 +1106,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
      return true;
  }
  
diff --git a/debian/patches/0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch b/debian/patches/0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
index 6c6a3e0..9538c3e 100644
--- a/debian/patches/0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
+++ b/debian/patches/0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
@@ -1,4 +1,4 @@
-From 83440ae9e002f0c7bdec6b54db6b382d2e28bf7d Mon Sep 17 00:00:00 2001
+From 23327bb4cdc00b47e0f96efca2fe494540f01601 Mon Sep 17 00:00:00 2001
 From: Jan Grulich <jgrulich at redhat.com>
 Date: Fri, 16 Jul 2021 13:00:03 +0200
 Subject: [PATCH] Client: do not empty clipboard when a new popup/window is
@@ -22,7 +22,7 @@ Cherry-pick: 1e57ebd501cfc2255300392cd4565cd034efeed8
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -597,6 +597,19 @@ void QWaylandDisplay::handleWaylandSync()
+@@ -601,6 +601,19 @@ void QWaylandDisplay::handleWaylandSync()
      QWindow *activeWindow = mActiveWindows.empty() ? nullptr : mActiveWindows.last()->window();
      if (activeWindow != QGuiApplication::focusWindow())
          QWindowSystemInterface::handleWindowActivated(activeWindow);
@@ -44,7 +44,7 @@ Cherry-pick: 1e57ebd501cfc2255300392cd4565cd034efeed8
  const wl_callback_listener QWaylandDisplay::syncCallbackListener = {
 --- a/src/client/qwaylandinputdevice.cpp
 +++ b/src/client/qwaylandinputdevice.cpp
-@@ -1300,14 +1300,6 @@ void QWaylandInputDevice::Keyboard::handleFocusDestroyed()
+@@ -1304,14 +1304,6 @@ void QWaylandInputDevice::Keyboard::handleFocusDestroyed()
  void QWaylandInputDevice::Keyboard::handleFocusLost()
  {
      mFocus = nullptr;
diff --git a/debian/patches/0019-Client-Implement-DataDeviceV3.patch b/debian/patches/0019-Client-Implement-DataDeviceV3.patch
index 1746de1..7d5c983 100644
--- a/debian/patches/0019-Client-Implement-DataDeviceV3.patch
+++ b/debian/patches/0019-Client-Implement-DataDeviceV3.patch
@@ -1,4 +1,4 @@
-From 8afae71a44d0d5a0be477863da791dd2dfe2027d Mon Sep 17 00:00:00 2001
+From e0e004c77140da5e454dadf4d6809c1603b5735d Mon Sep 17 00:00:00 2001
 From: David Edmundson <davidedmundson at kde.org>
 Date: Tue, 16 Feb 2021 09:51:47 +0000
 Subject: [PATCH] Client: Implement DataDeviceV3
@@ -394,7 +394,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  }
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -354,7 +354,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
+@@ -356,7 +356,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
          mInputDevices.append(inputDevice);
  #if QT_CONFIG(wayland_datadevice)
      } else if (interface == QStringLiteral("wl_data_device_manager")) {
diff --git a/debian/patches/0022-Handle-registry_global-out-of-constructor.patch b/debian/patches/0022-Handle-registry_global-out-of-constructor.patch
index 45eaf47..4a2ed9e 100644
--- a/debian/patches/0022-Handle-registry_global-out-of-constructor.patch
+++ b/debian/patches/0022-Handle-registry_global-out-of-constructor.patch
@@ -1,4 +1,4 @@
-From de7afd339100cac1470f875eafc22d3ee87870bd Mon Sep 17 00:00:00 2001
+From 5889bb845d951a7877201bca97ffe4bb2491d966 Mon Sep 17 00:00:00 2001
 From: Elvis Lee <kwangwoong.lee at lge.com>
 Date: Thu, 18 Feb 2021 15:45:49 +0900
 Subject: [PATCH] Handle registry_global out of constructor
@@ -18,7 +18,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -158,13 +158,6 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
+@@ -160,13 +160,6 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
      if (!mXkbContext)
          qCWarning(lcQpaWayland, "failed to create xkb context");
  #endif
@@ -32,7 +32,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  }
  
  QWaylandDisplay::~QWaylandDisplay(void)
-@@ -189,6 +182,18 @@ QWaylandDisplay::~QWaylandDisplay(void)
+@@ -191,6 +184,18 @@ QWaylandDisplay::~QWaylandDisplay(void)
          wl_display_disconnect(mDisplay);
  }
  
@@ -53,7 +53,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
      if (!mScreens.empty() || mPlaceholderScreen)
 --- a/src/client/qwaylanddisplay_p.h
 +++ b/src/client/qwaylanddisplay_p.h
-@@ -129,6 +129,8 @@ public:
+@@ -131,6 +131,8 @@ public:
      QWaylandDisplay(QWaylandIntegration *waylandIntegration);
      ~QWaylandDisplay(void) override;
  
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 8ced7be..b4c2809 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 cb887d58bdf4f685f0a1f226bfbc3b2806d8ca17 Mon Sep 17 00:00:00 2001
+From d89cc9deab3f61cacfad71e8aa32d83d421d49da 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
@@ -32,7 +32,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -85,10 +85,203 @@
+@@ -87,10 +87,203 @@
  
  #include <errno.h>
  
@@ -236,7 +236,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  Q_LOGGING_CATEGORY(lcQpaWayland, "qt.qpa.wayland"); // for general (uncategorized) Wayland platform logging
  
  struct wl_surface *QWaylandDisplay::createSurface(void *handle)
-@@ -162,6 +355,12 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
+@@ -164,6 +357,12 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
  
  QWaylandDisplay::~QWaylandDisplay(void)
  {
@@ -249,7 +249,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
      if (mSyncCallback)
          wl_callback_destroy(mSyncCallback);
  
-@@ -208,98 +407,37 @@ void QWaylandDisplay::ensureScreen()
+@@ -210,98 +409,37 @@ void QWaylandDisplay::ensureScreen()
  
  void QWaylandDisplay::checkError() const
  {
@@ -368,7 +368,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  }
  
  QWaylandScreen *QWaylandDisplay::screenForOutput(struct wl_output *output) const
-@@ -674,4 +812,6 @@ QWaylandCursorTheme *QWaylandDisplay::loadCursorTheme(const QString &name, int p
+@@ -678,4 +816,6 @@ QWaylandCursorTheme *QWaylandDisplay::loadCursorTheme(const QString &name, int p
  
  } // namespace QtWaylandClient
  
@@ -377,7 +377,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  QT_END_NAMESPACE
 --- a/src/client/qwaylanddisplay_p.h
 +++ b/src/client/qwaylanddisplay_p.h
-@@ -109,6 +109,7 @@ class QWaylandSurface;
+@@ -111,6 +111,7 @@ class QWaylandSurface;
  class QWaylandShellIntegration;
  class QWaylandCursor;
  class QWaylandCursorTheme;
@@ -385,7 +385,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  
  typedef void (*RegistryListener)(void *data,
                                   struct wl_registry *registry,
-@@ -120,12 +121,6 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDisplay : public QObject, public QtWayland
+@@ -122,12 +123,6 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDisplay : public QObject, public QtWayland
      Q_OBJECT
  
  public:
@@ -398,7 +398,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
      QWaylandDisplay(QWaylandIntegration *waylandIntegration);
      ~QWaylandDisplay(void) override;
  
-@@ -212,12 +207,11 @@ public:
+@@ -216,12 +211,11 @@ public:
      void handleKeyboardFocusChanged(QWaylandInputDevice *inputDevice);
      void handleWindowDestroyed(QWaylandWindow *window);
  
@@ -414,7 +414,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  public slots:
      void blockingReadEvents();
      void flushRequests();
-@@ -240,6 +234,9 @@ private:
+@@ -244,6 +238,9 @@ private:
      };
  
      struct wl_display *mDisplay = nullptr;
@@ -424,7 +424,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
      QtWayland::wl_compositor mCompositor;
      QScopedPointer<QWaylandShm> mShm;
      QList<QWaylandScreen *> mWaitingScreens;
-@@ -276,11 +273,9 @@ private:
+@@ -282,11 +279,9 @@ private:
      QWaylandInputDevice *mLastInputDevice = nullptr;
      QPointer<QWaylandWindow> mLastInputWindow;
      QPointer<QWaylandWindow> mLastKeyboardFocus;
@@ -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";
-@@ -1172,8 +1175,11 @@ void QWaylandWindow::requestUpdate()
+@@ -1179,8 +1182,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
-@@ -1186,7 +1192,12 @@ void QWaylandWindow::requestUpdate()
+@@ -1193,7 +1199,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);
  }
-@@ -1206,9 +1217,10 @@ void QWaylandWindow::handleUpdate()
+@@ -1213,9 +1224,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);
-@@ -1218,6 +1230,8 @@ void QWaylandWindow::handleUpdate()
+@@ -1225,6 +1237,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/0032-client-Simplify-round-trip-behavior.patch b/debian/patches/0032-client-Simplify-round-trip-behavior.patch
index 96e368b..7164726 100644
--- a/debian/patches/0032-client-Simplify-round-trip-behavior.patch
+++ b/debian/patches/0032-client-Simplify-round-trip-behavior.patch
@@ -1,4 +1,4 @@
-From 596ecf46bb0c2427cda2894dd2157b3f5a2cd34f Mon Sep 17 00:00:00 2001
+From 71a1a9791df20307dd4eb688b0957d0f695823c5 Mon Sep 17 00:00:00 2001
 From: David Edmundson <davidedmundson at kde.org>
 Date: Wed, 9 Feb 2022 17:20:48 +0000
 Subject: [PATCH] client: Simplify round trip behavior
@@ -23,7 +23,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -611,50 +611,9 @@ uint32_t QWaylandDisplay::currentTimeMillisec()
+@@ -615,50 +615,9 @@ uint32_t QWaylandDisplay::currentTimeMillisec()
      return 0;
  }
  
diff --git a/debian/patches/0039-Reduce-memory-leakage.patch b/debian/patches/0039-Reduce-memory-leakage.patch
index 9da631e..2a056f4 100644
--- a/debian/patches/0039-Reduce-memory-leakage.patch
+++ b/debian/patches/0039-Reduce-memory-leakage.patch
@@ -1,4 +1,4 @@
-From 1e58585693eb337fc1c80e10987ed27115255d97 Mon Sep 17 00:00:00 2001
+From 2197557879ae1e3459e715dbc20b21e8652cb972 Mon Sep 17 00:00:00 2001
 From: Ulf Hermann <ulf.hermann at qt.io>
 Date: Tue, 22 Feb 2022 12:31:08 +0100
 Subject: [PATCH] Reduce memory leakage
@@ -14,7 +14,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -379,6 +379,9 @@ QWaylandDisplay::~QWaylandDisplay(void)
+@@ -381,6 +381,9 @@ QWaylandDisplay::~QWaylandDisplay(void)
  #endif
      if (mDisplay)
          wl_display_disconnect(mDisplay);
diff --git a/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch b/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
index 7b8d106..36c00c8 100644
--- a/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
+++ b/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
@@ -1,4 +1,4 @@
-From 81ddf70997f62d5f1a02d89048c5ec2d3cd27eaf Mon Sep 17 00:00:00 2001
+From 9265dae0d87eaf2a0dfc8a67c46f6c11bd14d2ab Mon Sep 17 00:00:00 2001
 From: Weng Xuetian <wengxt at gmail.com>
 Date: Wed, 20 Jul 2022 15:57:40 -0700
 Subject: [PATCH] Only close popup in the the hierchary
@@ -79,7 +79,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
          reset();
      }
  }
-@@ -1290,6 +1273,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
+@@ -1297,6 +1280,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
      wl_region_destroy(region);
  }
  
@@ -244,10 +244,10 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
      auto positioner = new QtWayland::xdg_positioner(m_shell->create_positioner());
      // set_popup expects a position relative to the parent
      QPoint transientPos = m_window->geometry().topLeft(); // this is absolute
-@@ -407,8 +414,9 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
-     positioner->set_anchor(QtWayland::xdg_positioner::anchor_top_left);
-     positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right);
-     positioner->set_size(m_window->geometry().width(), m_window->geometry().height());
+@@ -411,8 +418,9 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
+         | QtWayland::xdg_positioner::constraint_adjustment_slide_y
+         | QtWayland::xdg_positioner::constraint_adjustment_flip_x
+         | QtWayland::xdg_positioner::constraint_adjustment_flip_y);
 -    m_popup = new Popup(this, parentXdgSurface, positioner);
 +    m_popup = new Popup(this, parent, positioner);
      positioner->destroy();
diff --git a/debian/patches/0044-Use-wl_surface.damage_buffer-on-the-client-side.patch b/debian/patches/0044-Use-wl_surface.damage_buffer-on-the-client-side.patch
index c6691ac..4602871 100644
--- a/debian/patches/0044-Use-wl_surface.damage_buffer-on-the-client-side.patch
+++ b/debian/patches/0044-Use-wl_surface.damage_buffer-on-the-client-side.patch
@@ -1,4 +1,4 @@
-From 5972e1c4eccb1baf89d6cf779925eb35a49a8d2d Mon Sep 17 00:00:00 2001
+From 2d3d929c86c5aab6dd30e02ade25697d49617335 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
-@@ -491,7 +491,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
+@@ -493,7 +493,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")) {
diff --git a/debian/patches/0045-Client-clear-focus-on-touch-cancel.patch b/debian/patches/0045-Client-clear-focus-on-touch-cancel.patch
index 27ec2ae..5160f93 100644
--- a/debian/patches/0045-Client-clear-focus-on-touch-cancel.patch
+++ b/debian/patches/0045-Client-clear-focus-on-touch-cancel.patch
@@ -1,4 +1,4 @@
-From c618467da4c06528537026e2b78f92265bce446f Mon Sep 17 00:00:00 2001
+From bdf04e01153aeda2c2bafa059dd21dc377eb82e1 Mon Sep 17 00:00:00 2001
 From: David Edmundson <davidedmundson at kde.org>
 Date: Fri, 5 Aug 2022 15:00:31 +0100
 Subject: [PATCH] Client: clear focus on touch cancel
@@ -24,7 +24,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 
 --- a/src/client/qwaylandinputdevice.cpp
 +++ b/src/client/qwaylandinputdevice.cpp
-@@ -1388,6 +1388,7 @@ void QWaylandInputDevice::Touch::touch_cancel()
+@@ -1392,6 +1392,7 @@ void QWaylandInputDevice::Touch::touch_cancel()
      if (touchExt)
          touchExt->touchCanceled();
  
diff --git a/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch b/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
index f102d51..b8da3b8 100644
--- a/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
+++ b/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
@@ -1,4 +1,4 @@
-From 4939cb0b313727474e340cf31a8037ede91517d3 Mon Sep 17 00:00:00 2001
+From 1ff4219d8c58f8356d9d12824948013cdfde6ac5 Mon Sep 17 00:00:00 2001
 From: Liang Qi <liang.qi at qt.io>
 Date: Fri, 11 Mar 2022 09:17:25 +0100
 Subject: [PATCH] client: Synthesize enter/leave event for popup in xdg-shell
@@ -40,7 +40,7 @@ Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
      }
  }
  
-@@ -438,6 +448,23 @@ void QWaylandXdgSurface::setGrabPopup(QWaylandWindow *parent, QWaylandInputDevic
+@@ -442,6 +452,23 @@ void QWaylandXdgSurface::setGrabPopup(QWaylandWindow *parent, QWaylandInputDevic
      }
      setPopup(parent);
      m_popup->grab(device, serial);
diff --git a/debian/patches/0054-Hold-surface-read-lock-throughout-QWaylandEglWindow-.patch b/debian/patches/0054-Hold-surface-read-lock-throughout-QWaylandEglWindow-.patch
index 6baf729..5c7e4fd 100644
--- a/debian/patches/0054-Hold-surface-read-lock-throughout-QWaylandEglWindow-.patch
+++ b/debian/patches/0054-Hold-surface-read-lock-throughout-QWaylandEglWindow-.patch
@@ -1,4 +1,4 @@
-From 9c607c771acdb3d820be7f112db99213a6c6d7eb Mon Sep 17 00:00:00 2001
+From 37ad4aeaa6dce748f5f6bcc5030be187e6320ec0 Mon Sep 17 00:00:00 2001
 From: David Edmundson <davidedmundson at kde.org>
 Date: Mon, 12 Sep 2022 13:28:08 +0100
 Subject: [PATCH] Hold surface read lock throughout
@@ -57,7 +57,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  #include "qwaylandglcontext.h"
  
  #include <QtEglSupport/private/qeglconvenience_p.h>
-@@ -124,6 +125,7 @@ void QWaylandEglWindow::updateSurface(bool create)
+@@ -115,6 +116,7 @@ void QWaylandEglWindow::updateSurface(bool create)
          }
          mOffset = QPoint();
      } else {
@@ -65,7 +65,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
          if (m_waylandEglWindow) {
              int current_width, current_height;
              static bool disableResizeCheck = qgetenv("QT_WAYLAND_DISABLE_RESIZECHECK").toInt();
-@@ -138,8 +140,8 @@ void QWaylandEglWindow::updateSurface(bool create)
+@@ -129,8 +131,8 @@ void QWaylandEglWindow::updateSurface(bool create)
  
                  m_resize = true;
              }
diff --git a/debian/patches/0062-Client-Handle-zwp_primary_selection_device_manager_v.patch b/debian/patches/0062-Client-Handle-zwp_primary_selection_device_manager_v.patch
index dad9c30..12b2878 100644
--- a/debian/patches/0062-Client-Handle-zwp_primary_selection_device_manager_v.patch
+++ b/debian/patches/0062-Client-Handle-zwp_primary_selection_device_manager_v.patch
@@ -1,4 +1,4 @@
-From d0e8f938567f841a779d7365b8b5037037045fc5 Mon Sep 17 00:00:00 2001
+From 21e354e7b1878a243d29466b19084083df3d0db9 Mon Sep 17 00:00:00 2001
 From: Vlad Zahorodnii <vlad.zahorodnii at kde.org>
 Date: Tue, 27 Sep 2022 22:05:07 +0300
 Subject: [PATCH] Client: Handle zwp_primary_selection_device_manager_v1 global
@@ -20,7 +20,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 
 --- a/src/client/qwaylanddisplay.cpp
 +++ b/src/client/qwaylanddisplay.cpp
-@@ -515,6 +515,8 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
+@@ -519,6 +519,8 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
  #if QT_CONFIG(wayland_client_primary_selection)
      } else if (interface == QStringLiteral("zwp_primary_selection_device_manager_v1")) {
          mPrimarySelectionManager.reset(new QWaylandPrimarySelectionDeviceManagerV1(this, id, 1));
@@ -29,7 +29,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  #endif
      } else if (interface == QStringLiteral("zwp_text_input_manager_v2") && !mClientSideInputContextRequested) {
          mTextInputManager.reset(new QtWayland::zwp_text_input_manager_v2(registry, id, 1));
-@@ -573,6 +575,13 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
+@@ -577,6 +579,13 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
                      inputDevice->setTextInput(nullptr);
                  mWaylandIntegration->reconfigureInputContext();
              }

More information about the Neon-commits mailing list