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