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

[Carlos De Maine]

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

drop upstreamed patch

D  +0    -38   debian/patches/406995207eae8d644b6e5262aa716a48c7e471a8.diff
M  +0    -1    debian/patches/series

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

diff --git a/debian/patches/406995207eae8d644b6e5262aa716a48c7e471a8.diff b/debian/patches/406995207eae8d644b6e5262aa716a48c7e471a8.diff
deleted file mode 100644
index f21b40d..0000000
--- a/debian/patches/406995207eae8d644b6e5262aa716a48c7e471a8.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 406995207eae8d644b6e5262aa716a48c7e471a8
-Author: David Edmundson <davidedmundson at kde.org>
-Date:   Wed Jul 10 09:00:33 2024 +0100
-
-    client: Guard against windows being on a null screen
-    
-    calculateScreenFromSurfaceEvents uses the screen information from our
-    surface enter events. If this is not set yet, or refers to outputs not
-    yet complete we fall back to the QWindow::screen. This was introduced in
-    e03613524fc9f6be5c4cd7e9bdb00bc09c7f1e0b.
-    
-    It was assumed that this would always be a valid value as QtBase keeps
-    it updated, but there are apparently paths for it to still be null.
-    
-    It will be evaluated again when the surface receives a wl_enter event or
-    the output that we have entered is finally initialised and we will then
-    be marked as on the correct screen.
-    
-    Change-Id: I33b4a5112c3426a8ea523d39a0658ba7ffee5298
-    Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
-    Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii at kde.org>
-    (cherry picked from commit c4f91b479303dda2e49499de249018d7c66c5f99)
-    Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
-    (cherry picked from commit ec07c90cd647fd7a647f3f10dcae4d18699263df)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index c3725ffc..19237318 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -1407,7 +1407,7 @@ void QWaylandWindow::handleScreensChanged()
- {
-     QPlatformScreen *newScreen = calculateScreenFromSurfaceEvents();
- 
--    if (newScreen->screen() == window()->screen())
-+    if (!newScreen || newScreen->screen() == window()->screen())
-         return;
- 
-     QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
diff --git a/debian/patches/series b/debian/patches/series
index 644dd74..6aca8d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-406995207eae8d644b6e5262aa716a48c7e471a8.diff
 632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff
 92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff
 c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff