11 files changed, 15 insertions, 20 deletions
diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild
index 295a4abc9..22fcf50eb 100755
--- a/source/a/lilo/lilo.SlackBuild
+++ b/source/a/lilo/lilo.SlackBuild
@@ -73,7 +73,7 @@ chmod 644 $PKG/boot/slack.bmp
 
 # Remove non-Slackware litter:
 ( cd $PKG/boot
-  rm -f coffee.bmp *debian*
+  rm -f coffee.* *debian*
 )
 rm -r $PKG/etc/{initramfs,kernel}
 
diff --git a/source/k/kernel-configs/config-generic-5.4.21 b/source/k/kernel-configs/config-generic-5.4.22
index be82a584d..1099c1537 100644
--- a/source/k/kernel-configs/config-generic-5.4.21
+++ b/source/k/kernel-configs/config-generic-5.4.22
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.21 Kernel Configuration
+# Linux/x86 5.4.22 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-5.4.21.x64 b/source/k/kernel-configs/config-generic-5.4.22.x64
index 6fdafce01..3a875f12b 100644
--- a/source/k/kernel-configs/config-generic-5.4.21.x64
+++ b/source/k/kernel-configs/config-generic-5.4.22.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.21 Kernel Configuration
+# Linux/x86 5.4.22 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.21-smp b/source/k/kernel-configs/config-generic-smp-5.4.22-smp
index 54711b2ec..d6342898e 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.21-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.22-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.21 Kernel Configuration
+# Linux/x86 5.4.22 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.21 b/source/k/kernel-configs/config-huge-5.4.22
index f0016b23e..9799fa2c9 100644
--- a/source/k/kernel-configs/config-huge-5.4.21
+++ b/source/k/kernel-configs/config-huge-5.4.22
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.21 Kernel Configuration
+# Linux/x86 5.4.22 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.21.x64 b/source/k/kernel-configs/config-huge-5.4.22.x64
index 0cdf5d33b..0c0aa01f6 100644
--- a/source/k/kernel-configs/config-huge-5.4.21.x64
+++ b/source/k/kernel-configs/config-huge-5.4.22.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.21 Kernel Configuration
+# Linux/x86 5.4.22 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.21-smp b/source/k/kernel-configs/config-huge-smp-5.4.22-smp
index 176b22482..6e2df7207 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.21-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.22-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.21 Kernel Configuration
+# Linux/x86 5.4.22 Kernel Configuration
 #
 
 #
diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
index 3ed33960b..e19896ebc 100755
--- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for vulkan-sdk
 
 # Copyright 2016, 2017  Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=vulkan-sdk
 VERSION=${VERSION:-$(echo Vulkan-ValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -176,7 +176,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DGLSLANG_INSTALL_DIR=$PKG/usr \
     -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
-    -DBUILD_WSI_WAYLAND_SUPPORT=Off \
+    -DBUILD_WSI_WAYLAND_SUPPORT=On \
     -DBUILD_WSI_MIR_SUPPORT=Off \
     ..
 
@@ -207,7 +207,7 @@ cd build
     -DBUILD_TESTS=Off \
     -DBUILD_WSI_XLIB_SUPPORT=On \
     -DBUILD_WSI_XCB_SUPPORT=On \
-    -DBUILD_WSI_WAYLAND_SUPPORT=Off \
+    -DBUILD_WSI_WAYLAND_SUPPORT=On \
     -DBUILD_WSI_MIR_SUPPORT=Off \
     -DCMAKE_BUILD_TYPE=Release \
     -DGLSLANG_INSTALL_DIR=$PKG/usr \
@@ -239,7 +239,7 @@ cd build
     -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
     -DGLSLANG_INSTALL_DIR=$PKG/usr \
     -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
-    -DBUILD_WSI_WAYLAND_SUPPORT=Off \
+    -DBUILD_WSI_WAYLAND_SUPPORT=On \
     -DBUILD_WSI_MIR_SUPPORT=Off \
     ..
 
diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xcb-proto
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xcb-proto
+++ b/source/x/x11/build/xcb-proto
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/post-install/libxcb.post-install b/source/x/x11/post-install/libxcb.post-install
index ebaacfd86..ed65ff56d 100644
--- a/source/x/x11/post-install/libxcb.post-install
+++ b/source/x/x11/post-install/libxcb.post-install
@@ -23,11 +23,6 @@
 # Add documentation:
 mkdir -p $PKG/usr/doc/libxcb-$MODULAR_PACKAGE_VERSION
 cp -a \
-  COPYING INSTALL NEWS README \
+  COPYING* NEWS* README* \
   $PKG/usr/doc/libxcb-$MODULAR_PACKAGE_VERSION
 mv $PKG/usr/share/doc/libxcb/tutorial $PKG/usr/doc/libxcb-$MODULAR_PACKAGE_VERSION
-# The manual isn't building for now, so...
-rm -rf $PKG/usr/share/doc/libxcb
-rmdir $PKG/usr/share/doc
-rmdir $PKG/usr/share
-
diff --git a/source/x/x11/post-install/xcb-proto.post-install b/source/x/x11/post-install/xcb-proto.post-install
index eb341027a..d620c9dc3 100644
--- a/source/x/x11/post-install/xcb-proto.post-install
+++ b/source/x/x11/post-install/xcb-proto.post-install
@@ -1,5 +1,5 @@
 # Add documentation:
 mkdir -p $PKG/usr/doc/xcb-proto-$MODULAR_PACKAGE_VERSION
 cp -a \
-  COPYING README \
+  COPYING* README* NEWS* TODO* \
   $PKG/usr/doc/xcb-proto-$MODULAR_PACKAGE_VERSION