From ade673003c13eca916a14c8db10be1f85476fe27 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 5 Nov 2022 19:39:34 +0100 Subject: [PATCH] xkeyboard-config: don't set datadir Also drop workarounds and patches that tried to fix the mess after changing datadir. Signed-off-by: Matthias Reichl --- packages/x11/data/xkeyboard-config/package.mk | 6 ++---- ...ard-config-995.01-2.36-fix-xkb-base-path.patch | 15 --------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete 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/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 5bd5ed45ef..11f8cb3cc7 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -18,12 +18,10 @@ configure_package() { } pre_configure_target() { - PKG_MESON_OPTS_TARGET="-Dcompat-rules=true \ - -Ddatadir=lib" + PKG_MESON_OPTS_TARGET="-Dcompat-rules=true" if [ "${DISPLAYSERVER}" = "x11" ]; then - PKG_MESON_OPTS_TARGET+=" -Dxkb-base=${XORG_PATH_XKB} \ - -Dxorg-rules-symlinks=true" + PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=true" else PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=false" fi 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 deleted file mode 100644 index ab2682ae1d..0000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- /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') -