From 66ae407ce2195a08e632167e091bc65a93000ef2 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Jul 06 2023 13:40:01 +0000 Subject: Fix arabic keyboard layout name Signed-off-by: Daniel P. Berrangé --- diff --git a/0001-pc-bios-keymaps-Use-the-official-xkb-name-for-Arabic.patch b/0001-pc-bios-keymaps-Use-the-official-xkb-name-for-Arabic.patch new file mode 100644 index 0000000..b25aeb4 --- /dev/null +++ b/0001-pc-bios-keymaps-Use-the-official-xkb-name-for-Arabic.patch @@ -0,0 +1,62 @@ +From 4ace54be1d671fb67795368001f2628facd49418 Mon Sep 17 00:00:00 2001 +From: Peter Maydell +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 +Reviewed-by: Richard Henderson +Reviewed-by: Philippe Mathieu-Daudé +Reviewed-by: Daniel P. Berrangé +Message-id: 20230620162024.1132013-1-peter.maydell@linaro.org +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1709 +(cherry picked from commit 497fad38979c16b6412388927401e577eba43d26) +--- + 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 158a3b410c..1cbcdebefa 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 + diff --git a/qemu.spec b/qemu.spec index b2ce8fd..6fb3211 100644 --- a/qemu.spec +++ b/qemu.spec @@ -357,6 +357,7 @@ Source36: README.tests # Fix SGX assert Patch: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch Patch: 0002-hw-pci-bridge-Make-PCIe-and-CXL-PXB-Devices-inherit-.patch +Patch: 0001-pc-bios-keymaps-Use-the-official-xkb-name-for-Arabic.patch BuildRequires: meson >= %{meson_version} BuildRequires: bison @@ -2785,6 +2786,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog * Mon Jul 03 2023 Camilla Conte - 2:8.0.2-1 - New upstream release 8.0.2 +- Fix arabic keyboard layout name * Thu Jun 01 2023 Richard W.M. Jones - 2:8.0.0-4 - Rebuild for libnfs soname bump