[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 cb0492e108329bf464bfb09527c9c07925f3dc88 by Dmitry Shachnev.
Committed on 24/12/2023 at 15:01.
Pushed by jriddell into branch 'Neon/unstable'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +1    -1    debian/patches/0002-Fix-issue-with-repeated-window-size-changes.patch
M  +1    -1    debian/patches/0013-Client-Don-t-always-recreate-frame-callbacks.patch
M  +1    -1    debian/patches/0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
M  +1    -1    debian/patches/0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
M  +2    -3    debian/patches/0019-Client-Implement-DataDeviceV3.patch
M  +7    -5    debian/patches/0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
M  +1    -1    debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
M  +2    -2    debian/patches/0056-Keep-toplevel-windows-in-the-top-left-corner-of-the-.patch
M  +2    -2    debian/patches/0061-Fix-frame-sync-related-to-unprotected-multithread-ac.patch
M  +1    -1    debian/patches/0067-Client-Manage-QMimeData-lifecycle.patch
M  +1    -1    debian/patches/skip_animated_cursor_test.diff

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

diff --git a/debian/changelog b/debian/changelog
index 6f41ced..7bca428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qtwayland-opensource-src (5.15.12-1) UNRELEASED; urgency=medium
   * Drop patches which annihilate each other:
     - 0055-Client-Ensure-that-wl_surface-lives-as-long-as-qtqui.patch
     - 0057-Revert-Client-Ensure-that-wl_surface-lives-as-long-a.patch
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Dec 2023 16:11:34 +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 eeb0225..bf93d05 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
@@ -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
-@@ -87,6 +87,7 @@ private:
+@@ -85,6 +85,7 @@ private:
      mutable QOpenGLFramebufferObject *m_contentFBO = nullptr;
  
      QSurfaceFormat m_format;
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 ae9ee8b..3e384e5 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
@@ -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
-@@ -1192,6 +1192,10 @@ void QWaylandWindow::requestUpdate()
+@@ -1199,6 +1199,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 a361517..d8196c0 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
@@ -38,7 +38,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
          window->handleFrameCallback();
      }
  };
-@@ -1201,11 +1205,6 @@ void QWaylandWindow::handleUpdate()
+@@ -1208,11 +1212,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 9efdd19..c7b8bdd 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
@@ -108,7 +108,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  }
  
  QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
-@@ -1105,10 +1106,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
+@@ -1112,10 +1113,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab)
      return true;
  }
  
diff --git a/debian/patches/0019-Client-Implement-DataDeviceV3.patch b/debian/patches/0019-Client-Implement-DataDeviceV3.patch
index 7d5c983..59021ac 100644
--- a/debian/patches/0019-Client-Implement-DataDeviceV3.patch
+++ b/debian/patches/0019-Client-Implement-DataDeviceV3.patch
@@ -329,7 +329,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  
 --- a/src/client/qwaylanddatasource.cpp
 +++ b/src/client/qwaylanddatasource.cpp
-@@ -101,7 +101,32 @@ void QWaylandDataSource::data_source_send(const QString &mime_type, int32_t fd)
+@@ -110,7 +110,32 @@ void QWaylandDataSource::data_source_send(const QString &mime_type, int32_t fd)
  
  void QWaylandDataSource::data_source_target(const QString &mime_type)
  {
@@ -365,7 +365,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  }
 --- a/src/client/qwaylanddatasource_p.h
 +++ b/src/client/qwaylanddatasource_p.h
-@@ -77,17 +77,25 @@ public:
+@@ -77,16 +77,24 @@ public:
      QMimeData *mimeData() const;
  
  Q_SIGNALS:
@@ -385,7 +385,6 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
 +    void data_source_action(uint32_t action) override;
  
  private:
-     QWaylandDisplay *m_display = nullptr;
      QMimeData *m_mime_data = nullptr;
 +    bool m_accepted = false;
 +    Qt::DropAction m_dropAction = Qt::IgnoreAction;
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 b4c2809..ed6b9fe 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
@@ -368,13 +368,15 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
  }
  
  QWaylandScreen *QWaylandDisplay::screenForOutput(struct wl_output *output) const
-@@ -678,4 +816,6 @@ QWaylandCursorTheme *QWaylandDisplay::loadCursorTheme(const QString &name, int p
+@@ -678,6 +816,8 @@ QWaylandCursorTheme *QWaylandDisplay::loadCursorTheme(const QString &name, int p
  
  } // namespace QtWaylandClient
  
 +#include "qwaylanddisplay.moc"
 +
  QT_END_NAMESPACE
+ 
+ #include "moc_qwaylanddisplay_p.cpp"
 --- a/src/client/qwaylanddisplay_p.h
 +++ b/src/client/qwaylanddisplay_p.h
 @@ -111,6 +111,7 @@ class QWaylandSurface;
@@ -497,7 +499,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";
-@@ -1179,8 +1182,11 @@ void QWaylandWindow::requestUpdate()
+@@ -1186,8 +1189,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 +513,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
-@@ -1193,7 +1199,12 @@ void QWaylandWindow::requestUpdate()
+@@ -1200,7 +1206,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 +527,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at qt.io>
              deliverUpdateRequest();
      }, Qt::QueuedConnection);
  }
-@@ -1213,9 +1224,10 @@ void QWaylandWindow::handleUpdate()
+@@ -1220,9 +1231,10 @@ void QWaylandWindow::handleUpdate()
      if (!mSurface)
          return;
  
@@ -538,7 +540,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);
-@@ -1225,6 +1237,8 @@ void QWaylandWindow::handleUpdate()
+@@ -1232,6 +1244,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/0041-Only-close-popup-in-the-the-hierchary.patch b/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
index 8b3138b..b591c5d 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
@@ -79,7 +79,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
          reset();
      }
  }
-@@ -1297,6 +1280,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
+@@ -1304,6 +1287,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
      wl_region_destroy(region);
  }
  
diff --git a/debian/patches/0056-Keep-toplevel-windows-in-the-top-left-corner-of-the-.patch b/debian/patches/0056-Keep-toplevel-windows-in-the-top-left-corner-of-the-.patch
index b62b006..6c19d79 100644
--- a/debian/patches/0056-Keep-toplevel-windows-in-the-top-left-corner-of-the-.patch
+++ b/debian/patches/0056-Keep-toplevel-windows-in-the-top-left-corner-of-the-.patch
@@ -37,7 +37,7 @@ Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
  QWaylandIntegration::~QWaylandIntegration()
 --- a/src/client/qwaylandwindow.cpp
 +++ b/src/client/qwaylandwindow.cpp
-@@ -361,8 +361,13 @@ void QWaylandWindow::setGeometry_helper(const QRect &rect)
+@@ -350,8 +350,13 @@ void QWaylandWindow::setGeometry_helper(const QRect &rect)
      }
  }
  
@@ -52,7 +52,7 @@ Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
      setGeometry_helper(rect);
  
      if (window()->isVisible() && rect.isValid()) {
-@@ -1044,6 +1049,13 @@ void QWaylandWindow::handleScreensChanged()
+@@ -1033,6 +1038,13 @@ void QWaylandWindow::handleScreensChanged()
  
      QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
      mLastReportedScreen = newScreen;
diff --git a/debian/patches/0061-Fix-frame-sync-related-to-unprotected-multithread-ac.patch b/debian/patches/0061-Fix-frame-sync-related-to-unprotected-multithread-ac.patch
index 185e937..8a937e9 100644
--- a/debian/patches/0061-Fix-frame-sync-related-to-unprotected-multithread-ac.patch
+++ b/debian/patches/0061-Fix-frame-sync-related-to-unprotected-multithread-ac.patch
@@ -73,7 +73,7 @@ Change-Id: Ie01d08d07a2f10f70606ed1935caac09cb4f0382
  
      mWaitingForFrameCallback = false;
      mFrameCallbackElapsedTimer.invalidate();
-@@ -1169,19 +1175,24 @@ void QWaylandWindow::timerEvent(QTimerEvent *event)
+@@ -1172,19 +1178,24 @@ void QWaylandWindow::timerEvent(QTimerEvent *event)
      if (event->timerId() != mFrameCallbackCheckIntervalTimerId)
          return;
  
@@ -109,7 +109,7 @@ Change-Id: Ie01d08d07a2f10f70606ed1935caac09cb4f0382
  }
  
  void QWaylandWindow::requestUpdate()
-@@ -1224,15 +1235,14 @@ void QWaylandWindow::handleUpdate()
+@@ -1227,15 +1238,14 @@ void QWaylandWindow::handleUpdate()
  {
      qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread();
  
diff --git a/debian/patches/0067-Client-Manage-QMimeData-lifecycle.patch b/debian/patches/0067-Client-Manage-QMimeData-lifecycle.patch
index a4c1975..978b850 100644
--- a/debian/patches/0067-Client-Manage-QMimeData-lifecycle.patch
+++ b/debian/patches/0067-Client-Manage-QMimeData-lifecycle.patch
@@ -102,7 +102,7 @@ Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
  }
 --- a/src/client/qwaylanddatasource.cpp
 +++ b/src/client/qwaylanddatasource.cpp
-@@ -71,11 +71,6 @@ QWaylandDataSource::~QWaylandDataSource()
+@@ -72,11 +72,6 @@ QWaylandDataSource::~QWaylandDataSource()
      destroy();
  }
  
diff --git a/debian/patches/skip_animated_cursor_test.diff b/debian/patches/skip_animated_cursor_test.diff
index b4546ba..ee46b4e 100644
--- a/debian/patches/skip_animated_cursor_test.diff
+++ b/debian/patches/skip_animated_cursor_test.diff
@@ -6,7 +6,7 @@ Last-Update: 2020-04-30
 
 --- a/tests/auto/client/seatv4/tst_seatv4.cpp
 +++ b/tests/auto/client/seatv4/tst_seatv4.cpp
-@@ -568,6 +568,7 @@ void tst_seatv4::hidpiBitmapCursorNonInt
+@@ -575,6 +575,7 @@ void tst_seatv4::hidpiBitmapCursorNonInt
  
  void tst_seatv4::animatedCursor()
  {



More information about the Neon-commits mailing list