[neon/qt/qtwayland/Neon/unstable] debian: Drop 0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch.

[Dmitry Shachnev]

Git commit e8d9cac2c05d2ce0b26dbbe66e8eb916061fd173 by Dmitry Shachnev.
Committed on 10/09/2022 at 18:43.
Pushed by jriddell into branch 'Neon/unstable'.

Drop 0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch.

Included in the new release.

M  +2    -0    debian/changelog
D  +0    -39   debian/patches/0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch
M  +0    -1    debian/patches/series

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

diff --git a/debian/changelog b/debian/changelog
index e7c849a..fb6ebe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtwayland-opensource-src (5.15.6-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop 0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch,
+    included in the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Sep 2022 21:36:17 +0300
 
diff --git a/debian/patches/0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch b/debian/patches/0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch
deleted file mode 100644
index d4acd5f..0000000
--- a/debian/patches/0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c7022c1c0107781993b1d13e7aa11dd3f7486249 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol at kde.org>
-Date: Tue, 13 Jul 2021 13:32:15 +0200
-Subject: [PATCH] Do not update the mask if we do not have a surface
-
-mMask serves as a cache to remember what we've sent, the source of truth
-for the value is window()->mask().
-No need to store values that we are going to discard, because it will
-confuse the state of newly created windows.
-
-Change-Id: I6aa3da82c7f09c7ef90d0f7060f292fb042730f0
-Pick-to: 5.15 6.2
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
-(cherry picked from commit 962f87190c682562b369c5ebd93dc9ce0915ed7a)
----
- src/client/qwaylandwindow.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -464,14 +464,15 @@ void QWaylandWindow::lower()
- 
- void QWaylandWindow::setMask(const QRegion &mask)
- {
-+    QReadLocker locker(&mSurfaceLock);
-+    if (!mSurface)
-+        return;
-+
-     if (mMask == mask)
-         return;
- 
-     mMask = mask;
- 
--    if (!mSurface)
--        return;
--
-     if (mMask.isEmpty()) {
-         mSurface->set_input_region(nullptr);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 83c677a..70f841e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
 0007-Fix-build.patch
 0008-Fix-remove-listener.patch
 0009-Hook-up-queryKeyboardModifers.patch
-0010-Do-not-update-the-mask-if-we-do-not-have-a-surface.patch
 0011-Correctly-detect-if-image-format-is-supported-by-QIm.patch
 0012-Wayland-client-Fix-crash-when-windows-are-shown-hidd.patch
 0013-Client-Don-t-always-recreate-frame-callbacks.patch