Fix build with libxkbcommon 1.6.0
This commit is contained in:
parent
6f7d445a4d
commit
02e73fb70e
|
@ -1,3 +1,9 @@
|
|||
qtbase-opensource-src (5.15.10+dfsg-3ok2.7) nile; urgency=medium
|
||||
|
||||
* Fix build with libxkbcommon 1.6.0.
|
||||
|
||||
-- liwenjun <liwenjun@kylinos.cn> Mon, 29 Jul 2024 09:32:06 +0800
|
||||
|
||||
qtbase-opensource-src (5.15.10+dfsg-3ok2.6) nile; urgency=medium
|
||||
|
||||
* BUG号:无
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
From: Rewnosor <liwenjun@kylinos.cn>
|
||||
Date: Mon, 29 Jul 2024 09:33:23 +0800
|
||||
Subject: Fix build with libxkbcommon 1.6.0
|
||||
|
||||
---
|
||||
src/platformsupport/input/xkbcommon/qxkbcommon.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
|
||||
index 4d6beb1..05f57aa 100644
|
||||
--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
|
||||
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
|
||||
@@ -273,10 +273,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.
|
|
@ -44,3 +44,4 @@ revert_startBlocking_removal.diff
|
|||
0044-Revert-3.patch
|
||||
0045-rebuild.patch
|
||||
0046-24-tooltip.patch
|
||||
0047-Fix-build-with-libxkbcommon-1.6.0.patch
|
||||
|
|
Loading…
Reference in New Issue