9 files changed, 20 insertions, 14 deletions
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt
index 56b327cb6..0dbdf9303 100644
--- a/source/ap/linuxdoc-tools/ChangeLog.txt
+++ b/source/ap/linuxdoc-tools/ChangeLog.txt
@@ -1,3 +1,12 @@
+Wed Jan 29 09:11:40 GMT 2020
+ linuxdoc-tools 0.9.73, build 5.
+ Stuart Winter <mozes@slackware.com>
+  * gnome-doc-tools: Make '/usr/bin/xml2po' and its accompanying Python module
+    build against Python3.
+    Thanks to bassmadrigal and ponce on LQ for the report and the patch.
+  * docbook2x: Removed '--disable-maintainer-mode' configuration flag
+    because it's no longer valid.
+
 Thu Jan  2 11:47:35 GMT 2020
  linuxdoc-tools 0.9.73, build 4.
  Stuart Winter <mozes@slackware.com>
diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build
index 444a2a5fe..2a30a4bb3 100755
--- a/source/ap/linuxdoc-tools/linuxdoc-tools.build
+++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build
@@ -112,6 +112,9 @@ autoreconf -v
 
 # Install:
 if [ "$1" = "nodocs" ]; then
+   echo "*********************************************************************"
+   echo "*** Building asciidoc without documentation - expect errors below ***"
+   echo "*********************************************************************"
    make -i install
    echo "******************************************************************"
    echo "*** Built asciidoc without documentation - expect errors above ***"
@@ -1047,6 +1050,7 @@ done || exit 1
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
+PYTHON=/usr/bin/python3 \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -1057,12 +1061,6 @@ CPPFLAGS="$SLKCFLAGS" \
   --enable-build-utils \
   --build=$ARCH-slackware-linux$HOSTTARGET || exit 1
 
-# Patch:
-#
-# Set python3 as the interpreter for 'xml2po'.  It's already been patched (above)
-# but the makefiles and other bits contain /usr/bin/python - which on Slackware is python2.
-egrep -lr '/usr/bin/python$' xml2po | xargs sed -i 's?/usr/bin/python?/usr/bin/python3?g'
-
 # No parallel build here because it doesn't work:
 make || exit 1
 
@@ -1200,7 +1198,6 @@ CPPFLAGS="$SLKCFLAGS" \
    --docdir=/usr/doc/docbook2X-$DOCBOOK2XVER \
    --sysconfdir=/etc \
    --localstatedir=/var \
-   --disable-maintainer-mode \
    --disable-dependency-tracking \
    --program-transform-name="s/^docbook2/docbook2x-/" \
    --with-html-xsl \
diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
index 7317d9630..ef4a4ff7c 100755
--- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
+++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
@@ -32,7 +32,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 export PKGVERSION=0.9.73 # use the version of linuxdoc-tools as the package version.
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 PKGEXT=${PKGEXT:-txz}
 
 export CWD=$PWD
diff --git a/source/k/kernel-configs/config-generic-5.4.15 b/source/k/kernel-configs/config-generic-5.4.16
index dd6a8a91a..39bd237eb 100644
--- a/source/k/kernel-configs/config-generic-5.4.15
+++ b/source/k/kernel-configs/config-generic-5.4.16
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.15 Kernel Configuration
+# Linux/x86 5.4.16 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-5.4.15.x64 b/source/k/kernel-configs/config-generic-5.4.16.x64
index 9db080df5..0bf54e000 100644
--- a/source/k/kernel-configs/config-generic-5.4.15.x64
+++ b/source/k/kernel-configs/config-generic-5.4.16.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.15 Kernel Configuration
+# Linux/x86 5.4.16 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.15-smp b/source/k/kernel-configs/config-generic-smp-5.4.16-smp
index 43776351b..498000577 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.15-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.16-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.15 Kernel Configuration
+# Linux/x86 5.4.16 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.15 b/source/k/kernel-configs/config-huge-5.4.16
index f6edd7d98..552f61c76 100644
--- a/source/k/kernel-configs/config-huge-5.4.15
+++ b/source/k/kernel-configs/config-huge-5.4.16
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.15 Kernel Configuration
+# Linux/x86 5.4.16 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.15.x64 b/source/k/kernel-configs/config-huge-5.4.16.x64
index 3e9df18f4..fc88e3c63 100644
--- a/source/k/kernel-configs/config-huge-5.4.15.x64
+++ b/source/k/kernel-configs/config-huge-5.4.16.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.15 Kernel Configuration
+# Linux/x86 5.4.16 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.15-smp b/source/k/kernel-configs/config-huge-smp-5.4.16-smp
index e5571e5c4..1ce9866d2 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.15-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.16-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.15 Kernel Configuration
+# Linux/x86 5.4.16 Kernel Configuration
 #
 
 #