search

CTSRD-CHERI / qemu

QEMU with support for CHERI
Other
54 stars 28 forks source link

pc-bios/keymaps: Use the official xkb name for Arabic layout, not the… #251

Closed bsdjhb closed 6 months ago

bsdjhb commented 6 months ago

… legacy synonym

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 (cherry picked from commit 497fad38979c16b6412388927401e577eba43d26)

bsdjhb commented 6 months ago

This backport fixes building on my desktop where I rebuilt my local packages about a month ago and got a new enough xkeyboard-config package.