0a0923bb48
- target/ppc: Remove unused xer_* macros - hw/mips: Build fw_cfg.c once - minikconf: print error entirely on stderr - target/ppc: Remove extra space from s128 field in ppc_vsr_t - hw/arm/virt:Keep Guest L1 cache type consistent with KVM - pc-bios/keymaps: Use the official xkb name for Arabic layout, not the legacy synonym Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit d1b87187cf117c1b09ecb9422379af9a66c6f949)
62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
From e0af5020f882bb9152afa50c6e24a93019946e75 Mon Sep 17 00:00:00 2001
|
|
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Tue, 20 Jun 2023 17:20:24 +0100
|
|
Subject: [PATCH] pc-bios/keymaps: Use the official xkb name for Arabic layout,
|
|
not the legacy synonym
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The xkb official name for the Arabic keyboard layout is 'ara'.
|
|
However xkb has for at least the past 15 years also permitted it to
|
|
be named via the legacy synonym 'ar'. In xkeyboard-config 2.39 this
|
|
synoynm was removed, which breaks compilation of QEMU:
|
|
|
|
FAILED: pc-bios/keymaps/ar
|
|
/home/fred/qemu-git/src/qemu/build-full/qemu-keymap -f pc-bios/keymaps/ar -l ar
|
|
xkbcommon: ERROR: Couldn't find file "symbols/ar" in include paths
|
|
xkbcommon: ERROR: 1 include paths searched:
|
|
xkbcommon: ERROR: /usr/share/X11/xkb
|
|
xkbcommon: ERROR: 3 include paths could not be added:
|
|
xkbcommon: ERROR: /home/fred/.config/xkb
|
|
xkbcommon: ERROR: /home/fred/.xkb
|
|
xkbcommon: ERROR: /etc/xkb
|
|
xkbcommon: ERROR: Abandoning symbols file "(unnamed)"
|
|
xkbcommon: ERROR: Failed to compile xkb_symbols
|
|
xkbcommon: ERROR: Failed to compile keymap
|
|
|
|
The upstream xkeyboard-config change removing the compat
|
|
mapping is:
|
|
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/470ad2cd8fea84d7210377161d86b31999bb5ea6
|
|
|
|
Make QEMU always ask for the 'ara' xkb layout, which should work on
|
|
both older and newer xkeyboard-config. We leave the QEMU name for
|
|
this keyboard layout as 'ar'; it is not the only one where our name
|
|
for it deviates from the xkb standard name.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Message-id: 20230620162024.1132013-1-peter.maydell@linaro.org
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1709
|
|
---
|
|
pc-bios/keymaps/meson.build | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
|
|
index 44247a12b5..6e025cddf2 100644
|
|
--- a/pc-bios/keymaps/meson.build
|
|
+++ b/pc-bios/keymaps/meson.build
|
|
@@ -1,5 +1,5 @@
|
|
keymaps = {
|
|
- 'ar': '-l ar',
|
|
+ 'ar': '-l ara',
|
|
'bepo': '-l fr -v dvorak',
|
|
'cz': '-l cz',
|
|
'da': '-l dk',
|
|
--
|
|
2.41.0.windows.1
|
|
|