Request 1092876: Submit xkeyboard-config

This request supersedes: request 1092500 (Show diff)

Overview

Request 1092876 accepted

- Update to version 2.39
* another bugfix release; also needed for changes for the Amharic
(am_ET.UTF-8) compose key sequences in libX11 1.8.5 (see
corresponding changelog entry in libX11 package); removes old
remappings like ar --> ara (git db45bd75, 470ad2cd) [breaks
current qemu build]

Created by sndirsch 12 months ago
In state accepted
Supersedes 1092500

Submit xkeyboard-config

Comments for request 1092876 8
Comments for request 1092500 8

Stefan Dirsch (sndirsch) - 12 months ago

author source maintainer

Needs changes for qemu build. Patch (not verified at all)

--- qemu-8.0.2/pc-bios/keymaps/meson.build.orig 2023-06-13 14:56:01.975719564 +0200
+++ qemu-8.0.2/pc-bios/keymaps/meson.build      2023-06-13 14:56:07.947850447 +0200
@@ -1,5 +1,5 @@
 keymaps = {
-  'ar': '-l ar',
+  'ar': '-l ara',
   'bepo': '-l fr -v dvorak',
   'cz': '-l cz',
   'da': '-l dk',

Stefan Dirsch (sndirsch) - 12 months ago

author source maintainer

@dfaggioli @lizhang ping

Fabian Vogt (favogt) - 11 months ago

@dfaggioli @lizhang ping

Ana Guerrero (anag+factory) - 11 months ago

reviewer

Needs QEMU fixed

Ana Guerrero (anag+factory) - 11 months ago

reviewer

Filed https://bugzilla.opensuse.org/show_bug.cgi?id=1212966

Fabian Vogt (favogt_factory) - 11 months ago

reviewer

Unignored: returned to active backlog.

Dominique Leuenberger (dimstar_suse) - 10 months ago

reviewer target maintainer

waiting for qemu

Stefan Dirsch (sndirsch) - 10 months ago

author source maintainer

It's now fixed in QEMU. https://build.opensuse.org/request/show/1099120

Fabian Vogt (favogt) - 12 months ago

Breaks QEMU:

[ 2670s] [7242/8299] /home/abuild/rpmbuild/BUILD/qemu-8.0.2/build/qemu-keymap -f pc-bios/keymaps/ar -l ar
[ 2670s] FAILED: pc-bios/keymaps/ar 
[ 2670s] /home/abuild/rpmbuild/BUILD/qemu-8.0.2/build/qemu-keymap -f pc-bios/keymaps/ar -l ar
[ 2670s] xkbcommon: ERROR: Couldn't find file "symbols/ar" in include paths
[ 2670s] xkbcommon: ERROR: 1 include paths searched:
[ 2670s] xkbcommon: ERROR:  /usr/share/X11/xkb
[ 2670s] xkbcommon: ERROR: 3 include paths could not be added:
[ 2670s] xkbcommon: ERROR:  /home/abuild/.config/xkb
[ 2670s] xkbcommon: ERROR:  /home/abuild/.xkb
[ 2670s] xkbcommon: ERROR:  /etc/xkb
[ 2670s] xkbcommon: ERROR: Abandoning symbols file "(unnamed)"
[ 2670s] xkbcommon: ERROR: Failed to compile xkb_symbols
[ 2670s] xkbcommon: ERROR: Failed to compile keymap

Stefan Dirsch (sndirsch) - 12 months ago

author source maintainer

This is https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/db45bd7504f5b854c01bfbcf23a7841808992ec7 and https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/470ad2cd8fea84d7210377161d86b31999bb5ea6 Can we patch qemu to use 'ara' instead of 'ar', please?

Stefan Dirsch (sndirsch) - 12 months ago

author source maintainer

I guess you just need to rename ar to ara in pc-bios/keymaps, but I haven't verified that.

Fabian Vogt (favogt) - 12 months ago

@dfaggioli @lizhang can you have a look?

Stefan Dirsch (sndirsch) - 12 months ago

author source maintainer

Seems this didn't help

[   14s] + STATUS=0
[   14s] + '[' 0 -ne 0 ']'
[   14s] + cd qemu-8.0.2
[   14s] + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
[   14s] + mv pc-bios/keymaps/ar pc-bios/keymaps/ara
[   14s] + RPM_EC=0
[   14s] ++ jobs -p
[   14s] + exit 0
[   14s] Executing(%build): /bin/bash -e /var/tmp/rpm-tmp.iy0SQT
[   14s] + umask 022
[   14s] + cd /home/abuild/rpmbuild/BUILD
[...]
[ 1586s] [7332/8299] /home/abuild/rpmbuild/BUILD/qemu-8.0.2/build/qemu-keymap -f
 pc-bios/keymaps/ar -l ar
[ 1586s] FAILED: pc-bios/keymaps/ar 
[ 1586s] /home/abuild/rpmbuild/BUILD/qemu-8.0.2/build/qemu-keymap -f pc-bios/key
maps/ar -l ar
[ 1586s] xkbcommon: ERROR: Couldn't find file "symbols/ar" in include paths
[ 1586s] xkbcommon: ERROR: 1 include paths searched:
[ 1586s] xkbcommon: ERROR:      /usr/share/X11/xkb
[ 1586s] xkbcommon: ERROR: 3 include paths could not be added:
[ 1586s] xkbcommon: ERROR:      /home/abuild/.config/xkb
[ 1586s] xkbcommon: ERROR:      /home/abuild/.xkb
[ 1586s] xkbcommon: ERROR:      /etc/xkb
[ 1586s] xkbcommon: ERROR: Abandoning symbols file "(unnamed)"
[ 1586s] xkbcommon: ERROR: Failed to compile xkb_symbols
[ 1586s] xkbcommon: ERROR: Failed to compile keymap

Fabian Vogt (favogt) - 12 months ago

You'll have to change it in pc-bios/keymaps/meson.build

Stefan Dirsch (sndirsch) - 12 months ago

author source maintainer

Thanks! That was just too obvious. ;-)

Fabian Vogt (favogt) - 12 months ago

Should probably be mentioned in the changelog