9 files changed, 42 insertions, 21 deletions
diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild
index ce875153..28c7478f 100755
--- a/source/d/bison/bison.SlackBuild
+++ b/source/d/bison/bison.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=bison
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -68,7 +68,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf bison-$VERSION
-tar xvf $CWD/bison-$VERSION.tar.xz || exit 1
+tar xvf $CWD/bison-$VERSION.tar.?z || exit 1
 cd bison-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/k/kernel-configs/config-generic-5.4.39 b/source/k/kernel-configs/config-generic-5.4.40
index a7a77357..5779f61c 100644
--- a/source/k/kernel-configs/config-generic-5.4.39
+++ b/source/k/kernel-configs/config-generic-5.4.40
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.39 Kernel Configuration
+# Linux/x86 5.4.40 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-5.4.39.x64 b/source/k/kernel-configs/config-generic-5.4.40.x64
index 0be8a78c..3e68f321 100644
--- a/source/k/kernel-configs/config-generic-5.4.39.x64
+++ b/source/k/kernel-configs/config-generic-5.4.40.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.39 Kernel Configuration
+# Linux/x86 5.4.40 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.39-smp b/source/k/kernel-configs/config-generic-smp-5.4.40-smp
index c53e9e41..8a455ee6 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.39-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.40-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.39 Kernel Configuration
+# Linux/x86 5.4.40 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.39 b/source/k/kernel-configs/config-huge-5.4.40
index 7607deaf..78ae6083 100644
--- a/source/k/kernel-configs/config-huge-5.4.39
+++ b/source/k/kernel-configs/config-huge-5.4.40
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.39 Kernel Configuration
+# Linux/x86 5.4.40 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.39.x64 b/source/k/kernel-configs/config-huge-5.4.40.x64
index 58b8706b..be45fa2d 100644
--- a/source/k/kernel-configs/config-huge-5.4.39.x64
+++ b/source/k/kernel-configs/config-huge-5.4.40.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.39 Kernel Configuration
+# Linux/x86 5.4.40 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.39-smp b/source/k/kernel-configs/config-huge-smp-5.4.40-smp
index 27d1d67b..dd986638 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.39-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.40-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.39 Kernel Configuration
+# Linux/x86 5.4.40 Kernel Configuration
 #
 
 #
diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild
index 93155edd..56377ebf 100755
--- a/source/l/shared-mime-info/shared-mime-info.SlackBuild
+++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild
@@ -82,20 +82,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-if [ ! -r configure ]; then
-  NOCONFIGURE=1 ./autogen.sh
-fi
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
+zcat $CWD/shared-mime-info.skip_tests.diff.gz | patch -p1 --verbose || exit 1
+
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
   --mandir=/usr/man \
-  --docdir=/usr/doc/${PKGNAM}-$VERSION \
-  --disable-update-mimedb \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --buildtype=release \
+  -Dupdate-mimedb=false \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
 mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}
@@ -127,7 +137,7 @@ fi
 
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING* HACKING NEWS README* \
+  COPYING* HACKING* MAINTAINERS* NEWS* README* code-of-conduct* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 chmod 644 $PKG/usr/doc/${PKGNAM}-$VERSION/*
 
diff --git a/source/l/shared-mime-info/shared-mime-info.skip_tests.diff b/source/l/shared-mime-info/shared-mime-info.skip_tests.diff
new file mode 100644
index 00000000..df07110c
--- /dev/null
+++ b/source/l/shared-mime-info/shared-mime-info.skip_tests.diff
@@ -0,0 +1,11 @@
+--- ./meson.build.orig	2020-05-06 09:01:04.000000000 -0500
++++ ./meson.build	2020-05-10 13:08:03.154102522 -0500
+@@ -66,7 +66,7 @@
+ subdir('po')
+ subdir('data')
+ subdir('src')
+-subdir('tests')
++#subdir('tests')
+ 
+ if get_option('update-mimedb')
+     upd_tool = (meson.is_cross_build()