From a6197d2eb8052dd88daa91d30f0115c18366a96e Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Wed, 31 Aug 2022 22:17:05 +0200 Subject: [PATCH] xkeyboard-config: fix broken meson xkb-base options --- ...ard-config-995.01-2.36-fix-xkb-base-path.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch new file mode 100644 index 0000000000..ab2682ae1d --- /dev/null +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch @@ -0,0 +1,15 @@ +--- /meson.build ++++ /meson.build +@@ -4,7 +4,10 @@ + meson_version: '>= 0.54.0') + + dir_data = join_paths(get_option('prefix'), get_option('datadir')) +-dir_xkb_base = join_paths(dir_data, 'X11', 'xkb') ++dir_xkb_base = get_option('xkb-base') ++if dir_xkb_base == '' ++ dir_xkb_base = join_paths(dir_data, 'X11', 'xkb') ++endif + dir_xkb_rules = join_paths(dir_xkb_base, 'rules') + dir_man7 = join_paths(get_option('prefix'), get_option('mandir'), 'man7') + dir_pkgconfig = join_paths(dir_data, 'pkgconfig') +