[neon/qt6/qt6-wayland/Neon/release] debian/patches: drop upstreamed patch

[Carlos De Maine]

Git commit f37057a7cf782e1d17b86176482eb028d922a0fd by Carlos De Maine.
Committed on 28/10/2024 at 08:22.
Pushed by carlosdem into branch 'Neon/release'.

drop upstreamed patch

D  +0    -80   debian/patches/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-wayland/-/commit/f37057a7cf782e1d17b86176482eb028d922a0fd

diff --git a/debian/patches/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff b/debian/patches/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff
deleted file mode 100644
index a9dff06..0000000
--- a/debian/patches/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-commit 632127d7f1d86cba4dd17361f24f9fd70a0ae44c
-Author: David Edmundson <davidedmundson at kde.org>
-Date:   Fri Jul 5 16:13:40 2024 +0100
-
-    Client: Improve thread safety determining window size on the render thread
-    
-    updateSurface is called from both the render and GUI thread. We
-    therefore need every property referenced to be thread safe.
-    
-    Rather than guarding each property we cache the buffer size whenever the
-    window geometry or scale changes and put a mutex round this one
-    variable.
-    
-    Change-Id: I4168ced27556e0e4558bbdbd1daa275d7523c33d
-    Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii at kde.org>
-    (cherry picked from commit 83da29c62f8fb918df8d91826d16b5d5ceb2c704)
-    Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
-    (cherry picked from commit f817608c7152487f489d0f3a227c1d0ceb7b0c2c)
-    Reviewed-by: David Edmundson <davidedmundson at kde.org>
-
-diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-index 652a6563..44f1038c 100644
---- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-@@ -50,6 +50,15 @@ QWaylandWindow::WindowType QWaylandEglWindow::windowType() const
- 
- void QWaylandEglWindow::ensureSize()
- {
-+    // this is always called on the main thread
-+    QMargins margins = mWindowDecoration ? frameMargins() : QMargins{};
-+    QRect rect = geometry();
-+    QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale();
-+    {
-+        QWriteLocker lock(&m_bufferSizeLock);
-+        m_bufferSize = sizeWithMargins;
-+    }
-+
-     updateSurface(false);
- }
- 
-@@ -60,14 +69,17 @@ void QWaylandEglWindow::setGeometry(const QRect &rect)
-     // we're now getting a resize we don't want to create it again.
-     // Just resize the wl_egl_window, the EGLSurface will be created
-     // the next time makeCurrent is called.
--    updateSurface(false);
-+    ensureSize();
- }
- 
- void QWaylandEglWindow::updateSurface(bool create)
- {
--    QMargins margins = mWindowDecoration ? frameMargins() : QMargins{};
--    QRect rect = geometry();
--    QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale();
-+
-+    QSize sizeWithMargins;
-+    {
-+        QReadLocker lock(&m_bufferSizeLock);
-+        sizeWithMargins = m_bufferSize;
-+    }
- 
-     // wl_egl_windows must have both width and height > 0
-     // mesa's egl returns NULL if we try to create a, invalid wl_egl_window, however not all EGL
-diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
-index 5b9aa987..048f0b61 100644
---- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
-@@ -60,7 +60,13 @@ private:
-     mutable QOpenGLFramebufferObject *m_contentFBO = nullptr;
- 
-     QSurfaceFormat m_format;
-+    // Size used in the last call to wl_egl_window_resize
-     QSize m_requestedSize;
-+
-+    // Size of the buffer used by QWaylandWindow
-+    // This is always written to from the main thread, potentially read from the rendering thread
-+    QReadWriteLock m_bufferSizeLock;
-+    QSize m_bufferSize;
- };
- 
- }
diff --git a/debian/patches/series b/debian/patches/series
index 6aca8d3..533899a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff
 92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff
 c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff