summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-10-09 19:37:34 -0400
committerIonen Wolkens <ionen@gentoo.org>2023-10-09 19:40:11 -0400
commiteebda96b3869cc7fb88007280498859184a70069 (patch)
tree00c802af788feb523aaed3eaa7533a3169abbbe6 /dev-qt/qtbase
parentdev-qt/qtgui: fix build with >=libxkbcommon-1.6.0 (diff)
downloadgentoo-eebda96b3869cc7fb88007280498859184a70069.tar.gz
gentoo-eebda96b3869cc7fb88007280498859184a70069.tar.bz2
gentoo-eebda96b3869cc7fb88007280498859184a70069.zip
dev-qt/qtbase: use a safer fix for xkbcommon-1.6.0
Do not believe it matters either way given these should be unused, but shouldn't hurt to inline instead until upstream's own fix. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtbase')
-rw-r--r--dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch6
1 files changed, 5 insertions, 1 deletions
diff --git a/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch b/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch
index 6a93b6b20b9e..bc0e0793d7e9 100644
--- a/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch
+++ b/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch
@@ -7,8 +7,12 @@ Just a quick fix while waiting for what [2] comes up with.
[2] https://bugreports.qt.io/browse/QTBUG-117950
--- a/src/gui/platform/unix/qxkbcommon.cpp
+++ b/src/gui/platform/unix/qxkbcommon.cpp
-@@ -242,4 +241,0 @@
+@@ -242,4 +242,4 @@
- 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>,
++ Xkb2Qt<0xfe90, Qt::Key_Dead_Lowline>,
++ Xkb2Qt<0xfe91, Qt::Key_Dead_Aboveverticalline>,
++ Xkb2Qt<0xfe92, Qt::Key_Dead_Belowverticalline>,
++ Xkb2Qt<0xfe93, Qt::Key_Dead_Longsolidusoverlay>,