12 files changed, 29 insertions, 22 deletions
diff --git a/source/d/subversion/get-svn-book.sh b/source/d/subversion/get-svn-book.sh
index e88530d3..b81ab0ef 100755
--- a/source/d/subversion/get-svn-book.sh
+++ b/source/d/subversion/get-svn-book.sh
@@ -3,6 +3,7 @@ CWD=`pwd`
 
 # Add the latest copy of the Subversion book:
 ( cd $CWD
+  rm -f svn-book-html.tar.bz2
   lftpget http://svnbook.red-bean.com/en/1.7/svn-book-html.tar.bz2
   chmod 644 svn-book-html.tar.bz2
 )
diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild
index 68e0e75b..43c3eeff 100755
--- a/source/d/subversion/subversion.SlackBuild
+++ b/source/d/subversion/subversion.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=subversion
 VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -98,25 +98,30 @@ CFLAGS="$SLKCFLAGS" \
   --with-lz4=internal \
   --with-zlib=/usr \
   --with-pic \
-  --with-kwallet \
   --build=$ARCH-slackware-linux || exit 1
 
+# Leave this out for now, because having qt5 and KDE4 installed confuses it.
+# We'll look at it again once we have Plasma 5.
+#  --with-kwallet
+
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 make install-tools DESTDIR=$PKG || exit 1
 make install-docs DESTDIR=$PKG || exit 1
 
-# Install python bindings
-make swig-py || exit 1
-make install-swig-py DESTDIR=$PKG || exit 1
-PYTHON_VER=$(python -c 'import sys; print "%d.%d" % sys.version_info[:2]')
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/python${PYTHON_VER}/site-packages
-mv $PKG/usr/lib${LIBDIRSUFFIX}/svn-python/* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/python${PYTHON_VER}/site-packages
-rmdir $PKG/usr/lib${LIBDIRSUFFIX}/svn-python
+## COMMENTED OUT - this doesn't work with swig > 4.0.0
+## If something actually needs it, let me know and I'll look at it again.
+## Install python bindings
+#make swig-py || exit 1
+#make install-swig-py DESTDIR=$PKG || exit 1
+#PYTHON_VER=$(python3 -c 'import sys; print "%d.%d" % sys.version_info[:2]')
+#mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/python${PYTHON_VER}/site-packages
+#mv $PKG/usr/lib${LIBDIRSUFFIX}/svn-python/* \
+#  $PKG/usr/lib${LIBDIRSUFFIX}/python${PYTHON_VER}/site-packages
+#rmdir $PKG/usr/lib${LIBDIRSUFFIX}/svn-python
 
 # Perl bindings
-make swig-pl-lib || exit 1
+make $NUMJOBS swig-pl-lib || exit 1
 make install-swig-pl-lib DESTDIR=$PKG || exit 1
 ( cd subversion/bindings/swig/perl/native
   perl Makefile.PL
@@ -126,7 +131,7 @@ eval $(perl '-V:archlib')
 mv $PKG/$archlib/perllocal.pod $PKG/$archlib/subversion.pod
 
 # Ruby bindings
-make swig-rb || exit 1
+make $NUMJOBS swig-rb || exit 1
 make install-swig-rb DESTDIR=$PKG || exit 1
 
 # Don't ship .la files:
diff --git a/source/k/kernel-configs/config-generic-5.4.43 b/source/k/kernel-configs/config-generic-5.4.44
index 3f2e81c2..2d3bc2df 100644
--- a/source/k/kernel-configs/config-generic-5.4.43
+++ b/source/k/kernel-configs/config-generic-5.4.44
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.43 Kernel Configuration
+# Linux/x86 5.4.44 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-5.4.43.x64 b/source/k/kernel-configs/config-generic-5.4.44.x64
index 49a1efb3..f583c236 100644
--- a/source/k/kernel-configs/config-generic-5.4.43.x64
+++ b/source/k/kernel-configs/config-generic-5.4.44.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.43 Kernel Configuration
+# Linux/x86 5.4.44 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.43-smp b/source/k/kernel-configs/config-generic-smp-5.4.44-smp
index c651ed75..16970be4 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.43-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.44-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.43 Kernel Configuration
+# Linux/x86 5.4.44 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.43 b/source/k/kernel-configs/config-huge-5.4.44
index 99b38e00..f3a0ba20 100644
--- a/source/k/kernel-configs/config-huge-5.4.43
+++ b/source/k/kernel-configs/config-huge-5.4.44
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.43 Kernel Configuration
+# Linux/x86 5.4.44 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.43.x64 b/source/k/kernel-configs/config-huge-5.4.44.x64
index d9134d4a..571e2ccc 100644
--- a/source/k/kernel-configs/config-huge-5.4.43.x64
+++ b/source/k/kernel-configs/config-huge-5.4.44.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.43 Kernel Configuration
+# Linux/x86 5.4.44 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.43-smp b/source/k/kernel-configs/config-huge-smp-5.4.44-smp
index 668d9bf7..f73c2e12 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.43-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.44-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.43 Kernel Configuration
+# Linux/x86 5.4.44 Kernel Configuration
 #
 
 #
diff --git a/source/l/harfbuzz/harfbuzz-2.6.7.tar.xz.sha256 b/source/l/harfbuzz/harfbuzz-2.6.7.tar.xz.sha256
new file mode 100644
index 00000000..d8d4e7ca
--- /dev/null
+++ b/source/l/harfbuzz/harfbuzz-2.6.7.tar.xz.sha256
@@ -0,0 +1 @@
+49e481d06cdff97bf68d99fa26bdf785331f411614485d892ea4c78eb479b218  harfbuzz-2.6.7.tar.xz
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 2f8ba30b..07d9ddaf 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=harfbuzz
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild
index 6a0f4563..d31535d3 100755
--- a/source/l/libcap/libcap.SlackBuild
+++ b/source/l/libcap/libcap.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libcap
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Building Go support is currently disabled until something actually needs it:
 GOSUPPORT=${GOSUPPORT:-no}
diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild
index 2db9928c..af1cc2eb 100755
--- a/source/n/gnutls/gnutls.SlackBuild
+++ b/source/n/gnutls/gnutls.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gnutls
 VERSION=${VERSION:-$(echo gnutls-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then