From 9d6917b0f3f61a3ef670811612645967e5719534 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 11 Feb 2022 01:09:45 +0000
Subject: Fri Feb 11 01:09:45 UTC 2022

x/xkeyboard-config-2.35.1-noarch-2.txz:  Rebuilt.
  Perhaps upstream didn't mean to move these files (or perhaps we should have
  recompiled everything that looks for these), but they did switch to meson,
  and the 'xkb-base' option to set the data directory doesn't work. Anyway,
  I've placed a symlink at /etc/X11/xkb and that fixes the problem.
  Thanks to Petri Kaukasoina and LuckyCyborg.
---
 source/x/mesa/mesa.SlackBuild                      |  2 +-
 source/x/x11/build/xkeyboard-config                |  2 +-
 source/x/x11/configure/xkeyboard-config            | 30 +++++++++++++---------
 source/x/x11/make/xkeyboard-config                 |  5 ++++
 .../x11/post-install/xkeyboard-config.post-install | 13 ++--------
 5 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 source/x/x11/make/xkeyboard-config

(limited to 'source/x')

diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 10cc14670..4328c7881 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mesa
 VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 DEMOVERS=${DEMOVERS:-8.4.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 BUILD_DEMOS=${BUILD_DEMOS:-YES}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xkeyboard-config
+++ b/source/x/x11/build/xkeyboard-config
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/configure/xkeyboard-config b/source/x/x11/configure/xkeyboard-config
index a5e05d6b5..fc2a5f14e 100644
--- a/source/x/x11/configure/xkeyboard-config
+++ b/source/x/x11/configure/xkeyboard-config
@@ -1,13 +1,19 @@
-./configure \
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --disable-static \
-  --enable-xkbcomp-symlink \
-  --enable-compat-rules \
-  --with-xkb-base=/etc/X11/xkb \
-  --with-xkb-rules-symlink=xfree86,xorg \
-  --build=$ARCH-slackware-linux
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir /usr/libexec \
+  --bindir /usr/bin \
+  --sbindir /usr/sbin \
+  --includedir /usr/include \
+  --datadir /usr/share \
+  --mandir /usr/man \
+  --sysconfdir /etc \
+  --localstatedir /var \
+  --buildtype=release \
+  -Dcompat-rules=true \
+  -Dxorg-rules-symlinks=true \
+  .. || exit 1
diff --git a/source/x/x11/make/xkeyboard-config b/source/x/x11/make/xkeyboard-config
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/xkeyboard-config
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+  ninja || exit 1
+  DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/post-install/xkeyboard-config.post-install b/source/x/x11/post-install/xkeyboard-config.post-install
index 8446f0641..92c647239 100644
--- a/source/x/x11/post-install/xkeyboard-config.post-install
+++ b/source/x/x11/post-install/xkeyboard-config.post-install
@@ -1,11 +1,2 @@
-# Move things into /etc/X11 that are supposed to be there:
-#mkdir -p $PKG/etc/X11
-#rm -rf $PKG/etc/X11/xkb
-#mv $PKG/usr/share/X11/xkb $PKG/etc/X11
-mkdir -p $PKG/usr/share/X11
-( cd $PKG/usr/share/X11 ; ln -sf ../../../etc/X11/xkb . )
-#( cd $PKG/etc/X11/xkb/rules
-#  ln -sf base.lst xorg.lst
-#  ln -sf base.xml xorg.xml
-#  ln -sf base xorg
-#)
+mkdir -p $PKG/etc/X11
+( cd $PKG/etc/X11 ; ln -sf ../../usr/share/X11/xkb . )
-- 
cgit v1.2.3-65-gdbad