From d41c15fb24f108fa844cb0e4e36a82ff9fab45e2 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 11 Feb 2022 20:36:58 +0000
Subject: Fri Feb 11 20:36:58 UTC 2022

a/kernel-firmware-20220209_6342082-noarch-1.txz:  Upgraded.
a/kernel-generic-5.16.9-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.16.9-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.16.9-x86_64-1.txz:  Upgraded.
ap/qpdf-10.6.1-x86_64-1.txz:  Upgraded.
d/binutils-2.38-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.16.9-x86-1.txz:  Upgraded.
d/oprofile-1.4.0-x86_64-9.txz:  Rebuilt.
  Recompiled against binutils-2.38.
k/kernel-source-5.16.9-noarch-1.txz:  Upgraded.
l/glib2-2.70.4-x86_64-1.txz:  Upgraded.
n/ModemManager-1.18.6-x86_64-1.txz:  Upgraded.
n/NetworkManager-1.34.0-x86_64-1.txz:  Upgraded.
n/libqmi-1.30.4-x86_64-1.txz:  Upgraded.
x/ibus-table-1.16.7-x86_64-1.txz:  Upgraded.
x/xorg-server-1.20.14-x86_64-3.txz:  Rebuilt.
  Rebuilt using --with-xkb-path=/usr/share/X11/xkb. Thanks to TheRealGrogan.
  Bump OS name: --with-os-name="Slackware 15.1".
x/xorg-server-xephyr-1.20.14-x86_64-3.txz:  Rebuilt.
x/xorg-server-xnest-1.20.14-x86_64-3.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.14-x86_64-3.txz:  Rebuilt.
x/xorg-server-xwayland-21.1.4-x86_64-2.txz:  Rebuilt.
  Rebuilt using -Dxkb_dir=/usr/share/X11/xkb.
xap/libnma-1.8.34-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/x/ibus-table/ibus-table.SlackBuild                     | 2 +-
 source/x/x11/build/xorg-server                                | 2 +-
 source/x/x11/configure/xorg-server                            | 4 ++--
 source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'source/x')

diff --git a/source/x/ibus-table/ibus-table.SlackBuild b/source/x/ibus-table/ibus-table.SlackBuild
index 1c56294b0..08ca1dc1d 100755
--- a/source/x/ibus-table/ibus-table.SlackBuild
+++ b/source/x/ibus-table/ibus-table.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-table
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index e4458a728..e3426aa21 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -63,9 +63,9 @@ CFLAGS="$SLKCFLAGS" \
   --with-int10=x86emu \
   --with-default-font-path="${DEF_FONTPATH}" \
   --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
-  --with-os-name="Slackware 15.0" \
+  --with-os-name="Slackware 15.1" \
   --with-os-vendor="Slackware Linux Project" \
-  --with-xkb-path=/etc/X11/xkb \
+  --with-xkb-path=/usr/share/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
   --enable-config-udev \
   --disable-config-hal \
diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
index 11c7061ff..1e94a6a43 100755
--- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
+++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=xorg-server-xwayland
 SRCNAM=xwayland
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Default font paths to be used by the X server:
 DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
@@ -100,6 +100,7 @@ meson setup \
   -Dxwayland_eglstream=true \
   -Ddefault_font_path="${DEF_FONTPATH}" \
   -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \
+  -Dxkb_dir=/usr/share/X11/xkb \
   -Dxkb_output_dir=/var/lib/xkb \
   -Dvendor_name="Slackware Linux Project" \
   -Dxdmcp=false \
-- 
cgit v1.2.3-65-gdbad