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 <hias@horus.com>

packages/x11/data/xkeyboard-config/package.mk

@@ -18,12 +18,10 @@ configure_package() {
 }
 
 pre_configure_target() {
-  PKG_MESON_OPTS_TARGET="-Dcompat-rules=true \
+  PKG_MESON_OPTS_TARGET="-Dcompat-rules=true"
-                         -Ddatadir=lib"
 
   if [ "${DISPLAYSERVER}" = "x11" ]; then
-    PKG_MESON_OPTS_TARGET+=" -Dxkb-base=${XORG_PATH_XKB} \
+    PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=true"
-                            -Dxorg-rules-symlinks=true"
   else
     PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=false"
   fi

packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch

@@ -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')
-