xkeyboard-config: upgrade to latest upstream

Upgrade to latest upstream HEAD, paving the way to eventually drop the fork.
The Nokia patch has been submitted upstream,
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/840

As of xkeyboard-config 2.45, the data directory has been changed to
/usr/share/xkeyboard-config-2/ instead of the legacy /usr/share/X11/xkb. Update
paths in the device-nokia-n900 package to match.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6869
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Sicelo A. Mhlongo 2025-08-02 21:05:38 +02:00 committed by Pablo Correa Gómez
parent 814e59b5a5
commit 5edf40fbe9
No known key found for this signature in database
GPG key ID: 7A342565FF635F79
4 changed files with 2481 additions and 74 deletions

View file

@ -2,8 +2,8 @@
# Maintainer: Sicelo <absicsz@gmail.com>
# Co-Maintainer: Danct12 <danct12@disroot.org>
pkgname=device-nokia-n900
pkgver=46
pkgrel=1
pkgver=47
pkgrel=0
pkgdesc="Nokia N900"
url="https://postmarketos.org"
arch="armv7"
@ -81,7 +81,7 @@ source="
udev/15-bq27k.rules
udev/90-touchscreen-dev.rules
upower.conf
x11-keymap
xkb-keymap
xorg.conf
xresources
"
@ -178,8 +178,8 @@ x11() {
xkeyboard_config() {
install_if="$pkgname=$pkgver-r$pkgrel xkeyboard-config"
replaces="xkeyboard-config"
install -D -m644 "$srcdir"/x11-keymap \
"$subpkgdir"/usr/share/X11/xkb/symbols/nokia_vndr/rx-51
install -D -m644 "$srcdir"/xkb-keymap \
"$subpkgdir"/usr/share/xkeyboard-config-2/symbols/nokia_vndr/nokiarx51
}
i3wm() {
@ -284,7 +284,7 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d 15-bq27k.rules
c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527 90-touchscreen-dev.rules
9b99feee42dd6bdd122769994c786d3127c41e0aa3321f19c82a9d3845cf07b522908621a31cbddd9599fe18c5c37127d9b4be4255cd7fa8e0e8983bf73eb41b upower.conf
c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085 x11-keymap
4de54d007bd354461fe4d6d455fe3f29694c132a3996c79b68070d606b5ca1839f9027202ebb731035f0bf6504b42fbd5ab15c7b47b7f308ce768a84d45024c4 xkb-keymap
a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2 xorg.conf
183dfdd545ba05e216209b1abe45e4af4e0ee16b2e73cff0e7ea7b9524ee35a1cf85213a77f32a1a94287aee6546885dbd71c6de1f4f1a1e2961e638ff27cdf6 xresources
"

View file

@ -1,7 +1,7 @@
default partial alphanumeric_keys
xkb_symbols "common" {
include "nokia_vndr/rx-51(common_keys)"
include "nokia_vndr/rx-51(modifiers)"
include "nokia_vndr/nokiarx51(common_keys)"
include "nokia_vndr/nokiarx51(modifiers)"
key <BKSP> { [ BackSpace, Delete, Escape, F12 ] };
@ -17,7 +17,7 @@ xkb_symbols "common" {
// Notice the similarity:
// "pc+us+cz(qwerty):2+grp:XYZ" vs.
// "nokia_vndr/rx-51(common)+nokia_vndr/rx-51(us)+nokia_vndr/rx-51(cz_qwerty):2+grp:XYZ"
// "nokia_vndr/nokiarx51(common)+nokia_vndr/nokiarx51(us)+nokia_vndr/nokiarx51(cz_qwerty):2+grp:XYZ"
// where XYZ is one of xkb_symbols section usually located in file symbols/group.
// Bear in mind that option XYZ could replace current keys configuration!!!
@ -53,8 +53,8 @@ xkb_symbols "common" {
partial alphanumeric_keys
xkb_symbols "us" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
};
@ -63,8 +63,8 @@ xkb_symbols "us" {
partial alphanumeric_keys
xkb_symbols "pl" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "Polish";
};
@ -73,8 +73,8 @@ xkb_symbols "pl" {
partial alphanumeric_keys
xkb_symbols "fise" {
include "nokia_vndr/rx-51(nordic_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(nordic_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Finnish/Swedish";
@ -87,8 +87,8 @@ xkb_symbols "fise" {
partial alphanumeric_keys
xkb_symbols "dano" {
include "nokia_vndr/rx-51(nordic_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(nordic_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Danish/Norwegian";
@ -101,8 +101,8 @@ xkb_symbols "dano" {
partial alphanumeric_keys
xkb_symbols "nordic" {
include "nokia_vndr/rx-51(nordic_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(nordic_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Danish/Finnish/Norwegian/Swedish";
@ -117,8 +117,8 @@ xkb_symbols "nordic" {
partial alphanumeric_keys
xkb_symbols "ptes" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Portuguese/Spanish";
@ -150,8 +150,8 @@ xkb_symbols "ptes" {
partial alphanumeric_keys
xkb_symbols "fr" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "French";
@ -186,8 +186,8 @@ xkb_symbols "fr" {
partial alphanumeric_keys
xkb_symbols "de" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "German";
@ -211,8 +211,8 @@ xkb_symbols "de" {
partial alphanumeric_keys
xkb_symbols "ch" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Swiss";
@ -250,8 +250,8 @@ xkb_symbols "ch" {
// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.
partial alphanumeric_keys
xkb_symbols "ru" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Russian";
@ -298,8 +298,8 @@ xkb_symbols "ru" {
partial alphanumeric_keys
xkb_symbols "it" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Italian";
@ -325,8 +325,8 @@ xkb_symbols "it" {
partial alphanumeric_keys
xkb_symbols "cz" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Czech";
@ -353,7 +353,7 @@ xkb_symbols "cz" {
partial alphanumeric_keys
xkb_symbols "cz_qwerty" {
include "nokia_vndr/rx-51(cz)"
include "nokia_vndr/nokiarx51(cz)"
name[Group1] = "Czech - qwerty";
@ -374,7 +374,7 @@ xkb_symbols "cz_qwerty" {
partial hidden alphanumeric_keys
xkb_symbols "nordic_base" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/nokiarx51(english_base)"
// 1. row
key <AB08> { [ aring, Aring, equal, equal ] };
@ -508,8 +508,8 @@ xkb_symbols "arrows_4btns" {
// author: Roman Moravcik
xkb_symbols "sk" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Slovak QWERTZ (CZ HW)";
@ -535,7 +535,7 @@ xkb_symbols "sk" {
};
xkb_symbols "sk_qwerty" {
include "nokia_vndr/rx-51(sk)"
include "nokia_vndr/nokiarx51(sk)"
name[Group1] = "Slovak QWERTY (CZ hw)";
@ -549,8 +549,8 @@ xkb_symbols "sk_qwerty" {
// author: Roman Moravcik
partial alphanumeric_keys
xkb_symbols "aren" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Arabic";
@ -597,8 +597,8 @@ xkb_symbols "aren" {
// author: Hessam Farhang
partial alphanumeric_keys
xkb_symbols "faen" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Persian";
@ -644,8 +644,8 @@ xkb_symbols "faen" {
// author: Jaroslav Poriz
xkb_symbols "dv" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "Dvorak";
@ -690,8 +690,8 @@ xkb_symbols "dv" {
// author: Faidon Liambotis
partial alphanumeric_keys
xkb_symbols "gr" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Greek";
@ -740,8 +740,8 @@ xkb_symbols "gr" {
// author: Roman Moravcik
partial alphanumeric_keys
xkb_symbols "bg_phonetic" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Bulgarian - Phonetic";
@ -792,8 +792,8 @@ xkb_symbols "bg_phonetic" {
// author: Nikola Kovachevski
partial alphanumeric_keys
xkb_symbols "mk" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Macedonian";
@ -844,8 +844,8 @@ xkb_symbols "mk" {
// author: Roman Moravcik
partial alphanumeric_keys
xkb_symbols "ru_phonetic" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "Russian - Phonetic";
name[Group2] = "U.S. English";
@ -927,8 +927,8 @@ xkb_symbols "ru_phonetic" {
// author: Roman Moravcik
partial alphanumeric_keys
xkb_symbols "he_phonetic" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Hebrew - Phonetic";
@ -975,8 +975,8 @@ xkb_symbols "he_phonetic" {
// author: Roman Moravcik
partial alphanumeric_keys
xkb_symbols "he" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Hebrew";
@ -1023,8 +1023,8 @@ xkb_symbols "he" {
// author: David Gegechkori
partial alphanumeric_keys
xkb_symbols "ge" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Georgian - Latin";
@ -1071,8 +1071,8 @@ xkb_symbols "ge" {
// author: Eriks Jansons
partial alphanumeric_keys
xkb_symbols "lv" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Latvian";
@ -1120,8 +1120,8 @@ xkb_symbols "lv" {
// author: Aleksandar Urosevic
partial alphanumeric_keys
xkb_symbols "sr_cyrillic" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Serbian - Cyrillic";
@ -1173,8 +1173,8 @@ xkb_symbols "sr_cyrillic" {
// author: Tarick
partial alphanumeric_keys
xkb_symbols "ua_phonetic" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "U.S. English";
name[Group2] = "Ukrainian - Phonetic";
@ -1258,8 +1258,8 @@ xkb_symbols "ua_phonetic" {
// author: Tarick
partial alphanumeric_keys
xkb_symbols "ua" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_2btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_2btns)"
name[Group1] = "U.S. English";
name[Group2] = "Ukrainian";
@ -1341,7 +1341,7 @@ xkb_symbols "ua" {
// created on 2010-10-31
partial alphanumeric_keys
xkb_symbols "ro" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/nokiarx51(english_base)"
name[Group1] = "Romanian";
@ -1356,8 +1356,8 @@ xkb_symbols "ro" {
// author: Thanawit Lertruengpanya
partial alphanumeric_keys
xkb_symbols "th" {
include "nokia_vndr/rx-51(english_base)"
include "nokia_vndr/rx-51(arrows_4btns)"
include "nokia_vndr/nokiarx51(english_base)"
include "nokia_vndr/nokiarx51(arrows_4btns)"
name[Group1] = "U.S. English";
name[Group2] = "Thai Kedmanee";

View file

@ -1,8 +1,9 @@
# Maintainer: Sicelo A. Mhlongo <absicsz@gmail.com>
pkgname=xkeyboard-config
pkgver=9999
_pkgver=2.41
pkgrel=0
_pkgver=2.45
_commit="23fec5367a042639ed93f7cf3878fbe9ddb84115"
pkgrel=1
pkgdesc="X keyboard configuration files"
url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
arch="armv7"
@ -11,9 +12,11 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends_dev="$pkgname"
makedepends="gettext meson perl libxslt"
checkdepends="gawk"
source="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/xkeyboard-config-$_pkgver/xkeyboard-config-xkeyboard-config-$_pkgver.tar.gz
source="
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/$_commit/xkeyboard-config-$_commit.tar.gz
re-nokia.patch
"
builddir="$srcdir"/xkeyboard-config-xkeyboard-config-$_pkgver
builddir="$srcdir/xkeyboard-config-$_commit"
build() {
abuild-meson . output
@ -29,5 +32,6 @@ package() {
}
sha512sums="
bae6ce7441154b8582cb431256899d748f8f45e24a28898e767e212d1233ea55d52de608ff760f37bb9930e47f1d0d840d085fd4129927e4a1ad3ab446f5b908 xkeyboard-config-xkeyboard-config-2.41.tar.gz
b40f1be143495cbf20b18016643cef5ff123f4b9eb236bbd789a300d220bd9476f858ee5bfb1bd4191aa6e3ece4b65510892c1982926b49ac8d2daa5dfbe258a xkeyboard-config-23fec5367a042639ed93f7cf3878fbe9ddb84115.tar.gz
88c44ba723dc97fdaba04076fc49ff09c01384b689e93c9b1ab2b7c4547ea88cb64fbd2f203094abe149d4c1ff6efe38529ddf37f97fbbc3a22a714966289775 re-nokia.patch
"

File diff suppressed because it is too large Load diff