[neon/qt/qtwayland/Neon/unstable] debian: Drop patches that are included in the new release.

[Dmitry Shachnev]

Git commit cbce851a10aea1bdf08838c7ffc735b997efdc40 by Dmitry Shachnev.
Committed on 06/01/2023 at 07:26.
Pushed by jriddell into branch 'Neon/unstable'.

Drop patches that are included in the new release.

M  +3    -0    debian/changelog
D  +0    -35   debian/patches/0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
D  +0    -33   debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
M  +0    -2    debian/patches/series

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

diff --git a/debian/changelog b/debian/changelog
index e2d6117..df713b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtwayland-opensource-src (5.15.8-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.8.
   * Bump ABI version to 5-15-8.
+  * Drop patches that are included in the new release:
+    - 0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
+    - 0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Jan 2023 11:12:42 +0400
 
diff --git a/debian/patches/0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch b/debian/patches/0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
deleted file mode 100644
index c6d40ac..0000000
--- a/debian/patches/0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 132be08e4d81c1e05b93f31a6e2b6a6bd65d5726 Mon Sep 17 00:00:00 2001
-From: Rodney Dawes <dobey.pwns at gmail.com>
-Date: Fri, 15 Oct 2021 12:55:33 -0400
-Subject: [PATCH] Fix the logic for decoding modifiers map in Wayland text
- input protocol
-
-Correctly check for the flags in the modifiers map when we get it from
-the compositor, instead of modifying the map in the for loop conditional.
-
-[ChangeLog][QWaylandInputContext] Fix modifiers map decoding
-logic when receiving the map from the compositor.
-
-Fixes: QTBUG-97094
-Pick-to: 6.2 5.15 5.12
-Change-Id: Idad19f7b1f4560d40abbb5b31032360cfe915261
-Reviewed-by: Paul Olav Tvete <paul.tvete at qt.io>
----
- src/client/qwaylandinputcontext.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/src/client/qwaylandinputcontext.cpp
-+++ b/src/client/qwaylandinputcontext.cpp
-@@ -387,8 +387,10 @@ void QWaylandTextInput::zwp_text_input_v2_input_method_changed(uint32_t serial,
- Qt::KeyboardModifiers QWaylandTextInput::modifiersToQtModifiers(uint32_t modifiers)
- {
-     Qt::KeyboardModifiers ret = Qt::NoModifier;
--    for (int i = 0; modifiers >>= 1; ++i) {
--        ret |= m_modifiersMap[i];
-+    for (int i = 0; i < m_modifiersMap.size(); ++i) {
-+        if (modifiers & (1 << i)) {
-+            ret |= m_modifiersMap[i];
-+        }
-     }
-     return ret;
- }
diff --git a/debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch b/debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
deleted file mode 100644
index a657bd0..0000000
--- a/debian/patches/0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1480fda6ab4a23debd2d1a75d0e8f6c851255441 Mon Sep 17 00:00:00 2001
-From: Inho Lee <inho.lee at qt.io>
-Date: Mon, 1 Nov 2021 14:23:58 +0100
-Subject: [PATCH] Do not create decorations when the shellSurface is not ready
-
-A cases reported that client windows try to make decorations
-when their shell surfaces are null.
-Since the surfaces' requests for decorations should be applied,
-those case will be failed to create decorations.
-
-This patch was modified by Paul Tvete's advice.
-(paul.tvete at qt.io)
-
-Pick-to: 6.2 5.15
-Task-number: QTBUG-97608
-Change-Id: I2563dbd73b730f81cc411857af07da99ceb2d063
-Reviewed-by: Paul Olav Tvete <paul.tvete at qt.io>
-(cherry picked from commit 246f0c0bc01dd059bf8165e81f7b49efa36e4d95)
----
- src/client/qwaylandwindow.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -828,7 +828,7 @@ bool QWaylandWindow::createDecoration()
-         decoration = false;
-     if (mSubSurfaceWindow)
-         decoration = false;
--    if (mShellSurface && !mShellSurface->wantsDecorations())
-+    if (!mShellSurface || !mShellSurface->wantsDecorations())
-         decoration = false;
- 
-     bool hadDecoration = mWindowDecoration;
diff --git a/debian/patches/series b/debian/patches/series
index 109232e..abac8f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@
 0011-Correctly-detect-if-image-format-is-supported-by-QIm.patch
 0013-Client-Don-t-always-recreate-frame-callbacks.patch
 0014-Client-Always-destroy-frame-callback-in-the-actual-c.patch
-0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
 0016-Wayland-client-use-wl_keyboard-to-determine-active-s.patch
 0017-Client-do-not-empty-clipboard-when-a-new-popup-windo.patch
 0018-Set-preedit-cursor-when-cursor-equals-to-0.patch
@@ -19,7 +18,6 @@
 0022-Handle-registry_global-out-of-constructor.patch
 0023-Connect-flushRequest-after-forceRoundTrip.patch
 0024-Move-the-wayland-socket-polling-to-a-separate-event-.patch
-0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
 0028-Fix-crash-if-no-input-method-module-could-be-loaded.patch
 0029-Client-Remove-mWaitingForUpdateDelivery.patch
 0030-Cursor-position-0-should-still-show-the-cursor.patch