Re: [PATCH] pc-bios/keymaps: Use the official xkb name for Arabic layout, not the legacy synonym

[Daniel P . Berrangé]

On Tue, Jun 20, 2023 at 05:20:24PM +0100, Peter Maydell wrote:
> 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>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1709
> ---
>  pc-bios/keymaps/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|