From 5ca9f8aea2876fe6926fc27f564d36eaf5ca5c8d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 17 Feb 2021 12:42:49 +1000 Subject: rules: add a "custom" layout to the XML file This layout does not exist and we will never provide it. However, having it in the XML file means it will show up in GUI configuration mechansism that parse the XML file directly (instead of using libxbkcommon's libxkbregistry). Our rulesets fall back to the file "symbols/layout", section "variant" for any layout(variant) that's not explicitly covered. This enables users to create a symbols/custom file with their layout and have it available. As there are no variants, the GUI tools will only be able to use the default section. Commandline tools can use variants as well. This is papering over the whole issue only, but it does provide for some convenience. It will still require adding a file in /usr/share in most cases, but since we do not provide this file, it will be safe from being overwritten. Fixes #257 Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6e96844..ec7b4fb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,6 +196,8 @@ layout_tests: stage: test needs: ["make_install"] script: + # make sure the custom layout resolves to something + - ln -s "$INSTDIR/share/X11/xkb/symbols/us" "$INSTDIR/share/X11/xkb/symbols/custom" - git clone https://github.com/xkbcommon/libxkbcommon - pushd libxkbcommon > /dev/null - meson builddir -Denable-wayland=false -Denable-x11=false -Denable-docs=false -Dxkb-config-root="$INSTDIR/share/X11/xkb" -- cgit v1.2.3