| Message ID | 20230620162024.1132013-1-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pc-bios/keymaps: Use the official xkb name for Arabic layout, not the legacy synonym | expand |
On 6/20/23 18:20, 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: Richard Henderson <richard.henderson@linaro.org> r~
On 20/6/23 18:20, 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: Philippe Mathieu-Daudé <philmd@linaro.org>
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
Peter Maydell <peter.maydell@linaro.org> writes: > 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: Queued to maintainer/june-2023-omnibus, thanks.
On Fri, 23 Jun 2023 at 16:21, Alex Bennée <alex.bennee@linaro.org> wrote: > > > Peter Maydell <peter.maydell@linaro.org> writes: > > > 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: > > Queued to maintainer/june-2023-omnibus, thanks. It's in my arm pullreq currently on list, so if that gets in first you can drop it. thanks -- PMM
Peter Maydell <peter.maydell@linaro.org> writes: > On Fri, 23 Jun 2023 at 16:21, Alex Bennée <alex.bennee@linaro.org> wrote: >> >> >> Peter Maydell <peter.maydell@linaro.org> writes: >> >> > 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: >> >> Queued to maintainer/june-2023-omnibus, thanks. > > It's in my arm pullreq currently on list, so if that gets > in first you can drop it. Will do. The qemu-keymap changes where needed for most of the fuzzer/clang failures I saw when upgrading the fedora container.
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index bff30833137..0bd8ce00775 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',
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(-)