Lubuntu/qt6-base
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport upstream patch to fix build with libxkbcommon 1.6.0 (Closes: #1054674).

Browse Source
This commit is contained in:
Patrick Franz 2023-10-28 11:26:39 +02:00
parent 0dd694ba4e
commit 6bcd522506
No known key found for this signature in database
GPG Key ID: 9E9F7A603077FE56
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,5 +1,9 @@
qt6-base (6.4.2+dfsg-19) UNRELEASED; urgency=medium
[ Patrick Franz ]
* Backport upstream patch to fix build with libxkbcommon 1.6.0
(Closes: #1054674).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 28 Oct 2023 11:24:24 +0200
qt6-base (6.4.2+dfsg-18) unstable; urgency=medium

34
debian/patches/libxkbcommon_1.6.0.diff vendored Normal file
View File

@ -0,0 +1,34 @@
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>
---
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
index 26d87c5..7b61179 100644
--- a/src/gui/platform/unix/qxkbcommon.cpp
+++ b/src/gui/platform/unix/qxkbcommon.cpp
@@ -237,10 +237,14 @@
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.

3
debian/patches/series vendored
View File

@ -1,3 +1,6 @@
# fixed in 6.5.4, 6.6.1
libxkbcommon_1.6.0.diff
# fixed in 6.5.2
cve-2023-34410-57ba626.diff
cve-2023-34410-ada2c57.diff