From 5377a9fdbb4973cba66e3291f83fc73de47c08fe Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 29 Jan 2024 11:07:21 +0800
Subject: [PATCH] fix build error of libxkbcommon 1.6.0

---
 fix-build-error-of-libxkbcommon-1.6.0.patch | 31 +++++++++++++++++++++
 qt6-qtbase.spec                             |  8 +++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 fix-build-error-of-libxkbcommon-1.6.0.patch

diff --git a/fix-build-error-of-libxkbcommon-1.6.0.patch b/fix-build-error-of-libxkbcommon-1.6.0.patch
new file mode 100644
index 0000000..b2d6ffe
--- /dev/null
+++ b/fix-build-error-of-libxkbcommon-1.6.0.patch
@@ -0,0 +1,31 @@
+From 00b748a08fd27277e4bd8f86b431a1e71423d7ff Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 29 Jan 2024 11:04:27 +0800
+Subject: [PATCH] fix build error of libxkbcommon 1.6.0
+
+---
+ 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 fc014b38..0de9e98f 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.41.0
+
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index cb60f53..b3ba66c 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -27,7 +27,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
 Version: 6.5.2
-Release: 1
+Release: 2
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://qt-project.org/
@@ -81,6 +81,9 @@ Patch90: qtbase-gcc11.patch
 %ifarch riscv64
 Patch100: fix-riscv-configure-tests.patch
 %endif
+
+Patch102: fix-build-error-of-libxkbcommon-1.6.0.patch
+
 #fix CVE
 Patch6001:qtbase6.5.2-CVE-2023-38197.patch
 Patch6003:qtbase6.5.1-CVE-2023-43114.patch
@@ -791,6 +794,9 @@ make check -k ||:
 
 
 %changelog
+* Mon Jan 29 2024 peijiankang <peijiankang@kylinos.cn> - 6.5.2-2
+- fix build error of libxkbcommon-1.6.0
+
 * Wed Nov 29 2023 peijiankang <peijiankang@kylinos.cn> - 6.5.2-1
 - update version to 6.5.2
 
-- 
Gitee