From abacbed30ef36337bd9296550b37d5c84f11c16e Mon Sep 17 00:00:00 2001
From: Patrick Franz <deltaone@debian.org>
Date: Mon, 4 Dec 2023 19:58:21 +0100
Subject: [PATCH] Remove patches that have been applied upstream.

---
 debian/changelog                          |  1 +
 debian/patches/accessibility_support.diff | 37 -----------------------
 debian/patches/libxkbcommon_1.6.0.diff    | 36 ----------------------
 debian/patches/series                     |  4 ---
 4 files changed, 1 insertion(+), 77 deletions(-)
 delete mode 100644 debian/patches/accessibility_support.diff
 delete mode 100644 debian/patches/libxkbcommon_1.6.0.diff

diff --git a/debian/changelog b/debian/changelog
index 5d301ee..ff51673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qt6-base (6.6.1+dfsg-1) UNRELEASED; urgency=medium
   * Make qt6-base-dev depend on libqt6opengl6 again.
   * New upstream release (6.6.1).
   * Update ABI to 6.6.1.
+  * Remove patches that have been applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 04 Dec 2023 19:53:40 +0100
 
diff --git a/debian/patches/accessibility_support.diff b/debian/patches/accessibility_support.diff
deleted file mode 100644
index b948748..0000000
--- a/debian/patches/accessibility_support.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From 197e5915585e8978e8b98a861f71f2d22b0d930e Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 01 Aug 2023 13:56:24 +0200
-Subject: [PATCH] a11y: fix race condition on atspi startup on Wayland
-
-This amends db346e711c9af50566c234cfc21199680e6cb499 .
-
-Previously we could race between dbus connecting and our "manual"
-enabled call since we didn't take into account whether dbus is
-connected or not.
-
-This lead to scenarios where opening an application (in particular under
-Wayland) would result in the application not being able to register on
-the a11y bus because registration was attempted too early.
-By simply taking connectedness into account we'll make sure to not
-run registration too early anymore.
-
-Pick-to: 6.5
-Change-Id: I46a3c0b57f8a0c83d3e5fae9e355c2061954031f
-Reviewed-by: Liang Qi <liang.qi@qt.io>
-(cherry picked from commit 918fed39156c90540a12557c7a6630ae3d7d841e)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
-
-diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-index f59d8be..8a3f82e 100644
---- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-+++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-@@ -38,7 +38,7 @@
-     // But do that only on next loop, once dbus is really settled.
-     QTimer::singleShot(
-         0, this, [this]{
--            if (dbusConnection->isEnabled())
-+            if (dbusConnection->isEnabled() && dbusConnection->connection().isConnected())
-                 enabledChanged(true);
-         });
- }
diff --git a/debian/patches/libxkbcommon_1.6.0.diff b/debian/patches/libxkbcommon_1.6.0.diff
deleted file mode 100644
index e6de82a..0000000
--- a/debian/patches/libxkbcommon_1.6.0.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
-
-A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
-https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
-https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
-
-Pick-to: 6.6 6.5 6.2 5.15
-Fixes: QTBUG-117950
-Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
----
-
----
- src/gui/platform/unix/qxkbcommon.cpp |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/gui/platform/unix/qxkbcommon.cpp
-+++ b/src/gui/platform/unix/qxkbcommon.cpp
-@@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMa
-         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
-         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
-+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
-+   The define check is kind of version check here. */
-+#ifdef XKB_KEY_dead_lowline
-         Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
-         Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
-         Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
-         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-+#endif
- 
-         // Special keys from X.org - This include multimedia keys,
-         // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/debian/patches/series b/debian/patches/series
index 86287a4..8c4cb48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-# fixed in 6.6.1
-libxkbcommon_1.6.0.diff
-accessibility_support.diff
-
 # Needs to be fixed upstream.
 Add-SH-detection.patch