From 1b593f6af17ac3196e8e6e9f8c39d251215b20147a1064dca0165ce6dcea5733 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Wed, 25 Oct 2023 14:17:28 +0000
Subject: [PATCH] build fix for xkbcommon 1.6

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-base?expand=0&rev=75
---
 ...ld-with-libxkbcommon-1.6.0-and-later.patch | 42 +++++++++++++++++++
 qt6-base.changes                              |  6 +++
 qt6-base.spec                                 |  1 +
 3 files changed, 49 insertions(+)
 create mode 100644 0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch

diff --git a/0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch b/0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
new file mode 100644
index 0000000..e10ba00
--- /dev/null
+++ b/0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
@@ -0,0 +1,42 @@
+From 450aabeeb075a77fe648a67569391ddb2a0bbf53 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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(+)
+
+diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
+index d254aee..56eb8a3 100644
+--- a/src/gui/platform/unix/qxkbcommon.cpp
++++ b/src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMakeArray(
+         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.
+-- 
+2.42.0
+
diff --git a/qt6-base.changes b/qt6-base.changes
index e1b5c8b..6c9abba 100644
--- a/qt6-base.changes
+++ b/qt6-base.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 25 14:16:30 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Add upstream change:
+  * 0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
+
 -------------------------------------------------------------------
 Tue Oct 10 09:39:48 UTC 2023 - Christophe Marin <christophe@krop.fr>
 
diff --git a/qt6-base.spec b/qt6-base.spec
index 578d25f..8e9095d 100644
--- a/qt6-base.spec
+++ b/qt6-base.spec
@@ -39,6 +39,7 @@ URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
 Source99:       qt6-base-rpmlintrc
 # Patches 0-100 are upstream patches #
+Patch0:         0001-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
 # Patches 100-200 are openSUSE and/or non-upstream(able) patches #
 Patch100:       0001-Tell-the-truth-about-private-API.patch
 # No need to pollute the library dir with object files, install them in the qt6 subfolder