Mon Apr 15 22:28:37 UTC 202420240415222837

ap/linuxdoc-tools-0.9.83-x86_64-1.txz:  Upgraded.
  Upgraded to linuxdoc-tools-0.9.83, gtk-doc-1.34.0, and asciidoc-10.2.0.
  See the ChangeLog in source/ap/linuxdoc-tools for more details.
  Thanks to Stuart Winter.
ap/sqlite-3.45.3-x86_64-1.txz:  Upgraded.
l/Mako-1.3.3-x86_64-1.txz:  Upgraded.
l/pipewire-1.0.5-x86_64-1.txz:  Upgraded.
l/python-hatchling-1.23.0-x86_64-1.txz:  Upgraded.
x/libwacom-2.11.0-x86_64-1.txz:  Upgraded.
x/xcb-proto-1.17.0-x86_64-1.txz:  Upgraded.
x/xf86-input-wacom-1.2.2-x86_64-1.txz:  Upgraded.
xap/pan-0.158-x86_64-1.txz:  Upgraded.
  Let's process the git pull with NOCONFIGURE=1 ./autogen.sh for FTIO. :-)

12 files changed, 176 insertions, 133 deletions

diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt
index b5e57dc7d..affa8b00a 100644
--- a/source/ap/linuxdoc-tools/ChangeLog.txt
+++ b/source/ap/linuxdoc-tools/ChangeLog.txt
@@ -1,3 +1,22 @@
+Thu Apr 11 08:08:08 UTC 2024
+ linuxdoc-tools 0.9.83, build 1.
+ Stuart Winter <mozes@slackware.com>
+ Version changes:
+  * Upgraded to linuxdoc-tools 0.9.83
+  * Upgraded to gtk-doc 1.34.0
+  * Upgraded to asciidoc 10.2.0
+ Maintenance:
+  * postbuildfixes.sh: Eliminate any remaining empty Python directories
+    after purging Python cache files.
+    Comment asciidoc config file '.new' renaming code, as asciidoc no longer
+    provides such files.
+  * linuxdoc-tools.build: corrected detection of the RiscV64 architecture.
+    Drop 'install/doinst.sh' as it was only used to manage installation of
+    the asciidoc configuration files.
+  * gnome-doc-utils: Refreshed SRPM.  Added a build-time configuration patch
+    in preparation for Python 3.12.
+  * docbook-style-xsl: Refreshed SRPM whilst looking for new patches.
+
 Thu Aug 12 10:02:06 BST 2021
  linuxdoc-tools 0.9.82, build 1.
  Stuart Winter <mozes@slackware.com>
diff --git a/source/ap/linuxdoc-tools/arm/build b/source/ap/linuxdoc-tools/arm/build
index 708dd6997..8ec625f74 100755
--- a/source/ap/linuxdoc-tools/arm/build
+++ b/source/ap/linuxdoc-tools/arm/build
@@ -1,15 +1,14 @@
 #!/bin/bash
 
-# armel/build
-# Check package dependencies, set metadata and launch
-# package build script.
-# by Stuart Winter <stuart@armedslack.org>
+# arm/build
+# Build wrapper for ap/linuxdoc-tools on Slackware ARM
+# Stuart Winter <mozes@slackware.com>
 #
 source /usr/share/slackdev/buildkit.sh
 
 # Package metadata:
 export PKGNAM=linuxdoc-tools
-export VERSION=${VERSION:-0.9.82}
+export VERSION=${VERSION:-0.9.83}
 export BUILD=${BUILD:-1}
 export PKGSERIES=${PKGSERIES:-ap}
 export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.txz
diff --git a/source/ap/linuxdoc-tools/doinst.sh b/source/ap/linuxdoc-tools/doinst.sh
deleted file mode 100644
index b9a1d17b6..000000000
--- a/source/ap/linuxdoc-tools/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-config() {
-  NEW="$1"
-  OLD="$( dirname $NEW )/$( basename $NEW .new )"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$( md5sum < $OLD )" = "$( md5sum < $NEW )" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build
index e95d9b69c..c68a7b52e 100755
--- a/source/ap/linuxdoc-tools/linuxdoc-tools.build
+++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build
@@ -4,7 +4,7 @@
 # Script:  linuxdoc-tools.build
 # Purpose: Build & install all components that form the linuxdoc-tools
 #          Slackware Package.
-# Credit:  written by Stuart Winter <mozes@slackware.com>
+# Author:  Stuart Winter <mozes@slackware.com>, 2005-2024
 #          with the docbook build code by Jerome Pinot <ngc891@gmail.com>
 #          and some script code taken from Debian, Red Hat/Fedora &
 #          Linux From Scratch documentation
@@ -23,7 +23,7 @@
 LINUXDOCTOOLSVER=$PKGVERSION
 
 # Bundled package versions:
-ASCIIDOCVER=9.1.0
+ASCIIDOCVER=10.2.0
 DSSSLSTYLESHEETSVER=1.79 # docbook-dsssl-*.tar.xz (plus -doc- source archive), not SRPM.
 XSLSTYLESHEETSVER=1.79.2 # docbook-style-xsl-*src.rpm ("DocBook XSL Stylesheets" in our ChangeLog.txt)
 DOCBOOKUTILSVER=0.6.14
@@ -31,7 +31,7 @@ SGMLDTD3VER=3.1
 SGMLDTD4VER=4.5
 XMLDTDVER=4.5
 GNOMEDOCUTILSVER=0.20.10
-GTKDOCVER=1.33.2
+GTKDOCVER=1.34.0
 SGMLSPLVER=1.03ii
 OPENJADEVER=1.3.2
 OPENSPVER=1.5.2
@@ -53,7 +53,7 @@ case $ARCH in
            export LIBDIRSUFFIX="64"
            export HOSTTARGET=""
            ;;
-  riscv)   export SLKCFLAGS="-O2"
+  riscv64) export SLKCFLAGS="-O2"
            export LIBDIRSUFFIX="64"
            export HOSTTARGET=""
            ;;
@@ -78,7 +78,7 @@ function build_asciidoc() {
 # Extract source:
 cd $TMP
 rm -rf asciidoc
-mkdir asciidoc && cd asciidoc
+mkdir -p asciidoc{,-collect} && cd asciidoc
 rpm2cpio $CWD/sources/asciidoc-${ASCIIDOCVER}*.src.rpm | cpio -div || exit 1
 tar xvf asciidoc-py-*.tar.*z
 cd asciidoc-py-*/ || exit 1
@@ -92,11 +92,12 @@ find . \
 # Apply patches:
 # Assemble patch list from spec file:
 # grep -E '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}'
-#for i in \
-# \
-#  \
-#  ; do patch -p1 --verbose < ../${i} || exit 1
-#done || exit 1
+for i in \
+ \
+ asciidoc-table-separator.patch \
+  \
+  ; do patch -p1 --verbose < ../${i} || exit 1
+done || exit 1
 
 # Configure:
 autoreconf -v
@@ -116,20 +117,34 @@ if [ "$1" = "nodocs" ]; then
    echo "*** Built asciidoc without documentation - expect errors above ***"
    echo "******************************************************************"
  else
-   make install docs || exit 1
+   # It's the full build and installation:
+   # Install the documentation into a temporary location so that we can
+   # filter it manually, as it does not respect --mandir and there's a good
+   # amount of superfluous stuff that we don't want to package:
+   make install docs DESTDIR=$TMP/asciidoc-collect || exit 1
+   # "make install" target doesn't include the docs, so we can install
+   # everything else for collection by slacktrack directly:
+   make install || exit 1
+   [ ! -x /usr/bin/asciidoc ] && { echo "*** Error: asciidoc wasn't installed! ***" ; exit 1;}
+
+   # Copy docs:
+   mkdir -vpm755 /usr/doc/asciidoc-$ASCIIDOCVER
+   cp -fav \
+      BUGS.adoc CHANGELOG.adoc COPYRIGHT LICENSE README.md \
+      /usr/doc/asciidoc-$ASCIIDOCVER/
+
+   # Collect what we want and place it into the file system for collection
+   # by slacktrack:
+   pushd $TMP/asciidoc-collect/usr/doc/asciidoc-*/
+   # Man pages:
+   mv -fv doc/{asciidoc.1,a2x.1} /usr/man/man1/
+   rm -fv doc/*.1.txt # wipe the sources
+   # Other stuff:
+   # We're omitting these dirs: dblatex/ docbook-xsl/
+   mv -fv doc images /usr/doc/asciidoc-$ASCIIDOCVER/
+   popd
 fi
 
-find /etc/asciidoc -type f -print0 | xargs -0 chmod 644
-
-# After the build completes, we'll rename the asciidoc config files to '.new'
-# (see 'postbuildfixes.sh'), but for now we need them in place so that the
-# application works, since asciidoc is used to build some of this monolithic package.
-
-# Copy docs:
-mkdir -vpm755 /usr/doc/asciidoc-$ASCIIDOCVER
-cp -fav \
-  BUGS.txt CHANGELOG.txt COPY* README.asciidoc \
-  /usr/doc/asciidoc-$ASCIIDOCVER/
 }
 
 # Build asciidoc without any documentation (man pages).  We'll have
@@ -329,9 +344,8 @@ patch --verbose -p1 < ../opensp-nodeids.patch || exit 1
 find . -name config.guess -print0 | xargs -0i cp -favv /usr/share/libtool/build-aux/config.guess '{}'
 find . -name config.sub -print0 | xargs -0i cp -favv /usr/share/libtool/build-aux/config.sub '{}'
 
-# Configure without optimisation.  OpenSP & OpenJade
-# are sensitive to optimisations, resulting in segfaults,
-# particularly on the ARM platform.  Apparently -O1 will work but
+# Configure without optimisation.  OpenSP & OpenJade are sensitive to optimisations,
+# resulting in segfaults, particularly on the ARM platform.  Apparently -O1 will work but
 # let's just leave it as is.
 #
 # This is configured not to build the documentation.  If anybody really needs
@@ -395,7 +409,7 @@ mv -fv /usr/doc/OpenSP /usr/doc/OpenSP-$OPENSPVER
 
 ####################### Build OpenJade ############################
 # Reference:
-#  http://cblfs.cross-lfs.org/index.php/OpenJade
+# https://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
 
 # Extract source:
 cd $TMP
@@ -776,6 +790,7 @@ find . \
 # Apply patches:
 # Note: 'docbook-style-xsl-non-recursive-string-subst.patch' is applied separately
 # as it needs a different patch level.
+# We don't apply 'docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch'
 for i in \
  \
  docbook-xsl-pagesetup.patch \
@@ -787,7 +802,7 @@ for i in \
  \
  ; do patch --verbose -p1 < ../../$i
 done || exit 1
-patch -p2 < ../../docbook-style-xsl-non-recursive-string-subst.patch || exit 1
+patch --verbose -p2 < ../../docbook-style-xsl-non-recursive-string-subst.patch || exit 1
 
 cp -fav ../../docbook-style-xsl.Makefile Makefile
 # Switch to UTF-8 files:
@@ -952,8 +967,8 @@ cd $TMP
 mkdir linuxdoc-tools && cd linuxdoc-tools
 #rpm2cpio $CWD/sources/linuxdoc-tools-${LINUXDOCTOOLSVER}*.src.rpm | cpio -div || exit 1
 #tar xvf linuxdoc-tools_$LINUXDOCTOOLSVER.tar.gz
-tar xvf $CWD/sources/linuxdoc-tools_$LINUXDOCTOOLSVER.tar.?z
-cd linuxdoc-tools-$LINUXDOCTOOLSVER || exit 1
+tar xvf $CWD/sources/linuxdoc-tools-$LINUXDOCTOOLSVER.tar.?z
+cd linuxdoc-tools*/ || exit 1
 
 chown -R root:root .
 find . \
@@ -974,8 +989,8 @@ export PATH=$( echo $PATH | sed -e 's?:/usr/share/texmf/bin??g' -e 's?/usr/share
 # latest linuxdoc-tools source.  It simply changed the default page size to 'Letter'.
 # Probably not too much to worry about there.
 for i in \
-  linuxdoc-tools-0.9.20-lib64.patch.xz ; do
-    xzcat $CWD/sources/$i | patch -p1 || exit 1
+  linuxdoc-tools-0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch.xz ; do
+    xzcat $CWD/sources/$i | patch --verbose -p1 || exit 1
 done || exit 1
 
 # Find out what our Vendor perl directory is:
@@ -1055,6 +1070,7 @@ find . \
 for i in \
  \
   gnome-doc-utils-0.20.10-python3.patch \
+  gnome-doc-utils-0.20.10-configure-py312.patch \
   \
   ; do patch --verbose -p1 < ../$i
 done || exit 1
@@ -1113,7 +1129,7 @@ find . \
 # and we've never included it.
 for i in \
  \
- 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch \
+ 74.patch \
   \
   ; do patch --verbose -p1 < ../$i
 done || exit 1
@@ -1255,4 +1271,4 @@ build_asciidoc
 rm -rf /install
 mkdir -vpm755 /install
 install -vpm644 $CWD/slack-desc /install
-zcat $CWD/doinst.sh.gz > /install/doinst.sh
+#zcat $CWD/doinst.sh.gz > /install/doinst.sh
diff --git a/source/ap/linuxdoc-tools/postbuildfixes.sh b/source/ap/linuxdoc-tools/postbuildfixes.sh
index 9382245cc..e659c3763 100755
--- a/source/ap/linuxdoc-tools/postbuildfixes.sh
+++ b/source/ap/linuxdoc-tools/postbuildfixes.sh
@@ -40,6 +40,11 @@ chmod -R a-s .
 # Remove dangling symlinks from /usr/doc.  asciidoc-8.6.7 was a culprit.
 find usr/doc -xtype l -print0 | xargs -0 rm -fv
 
+# Delete any empty directories left over by the removal of the orphaned Python cache
+# files.  e.g.
+# usr/lib/python3.11/site-packages/mesonbuild/__pycache__/
+find usr/lib*/python* -type d -empty -delete
+
 # Ensure some permissions.
 # I don't know why but these dirs are installed chmod 1755:
 #drwxr-xr-t root/root         0 2006-05-27 15:42:44 var/lib/texmf/
@@ -75,20 +80,21 @@ find . -name "*.txt" | while read docfile ; do
 done
 popd
 
+# Gone in asciidoc-10, but retaining for future reference:
 # Allow preservation of conf files for ascii-doc.  Some of the other bundled
 # packages may benefit from this treatment, but nobody's asked for anything
 # other than asciidoc in over 10 years!
-echo "Renaming configuration files to '.conf.new'.."
-find etc/asciidoc -type f -name '*.conf' -print0 | xargs -0i mv -fv '{}' '{}.new'
-# Search for any dangling symlinks created by renaming the files:
-if [ ! -z "$( find -L etc/asciidoc -type l -print )" ]; then
-   echo "WARNING: Dangling symlinks in etc/asciidoc -- you need to fix them!"
-   find -L etc/asciidoc -type l -print
-fi
-# Populate the doinst.sh script
-find etc/asciidoc -type f -name '*.conf.new' | while read cfile ; do
-  echo "config $cfile" >> install/doinst.sh
-done
+#echo "Renaming configuration files to '.conf.new'.."
+##find etc/asciidoc -type f -name '*.conf' -print0 | xargs -0i mv -fv '{}' '{}.new'
+## Search for any dangling symlinks created by renaming the files:
+#if [ ! -z "$( find -L etc/asciidoc -type l -print )" ]; then
+#   echo "WARNING: Dangling symlinks in etc/asciidoc -- you need to fix them!"
+#   find -L etc/asciidoc -type l -print
+#fi
+## Populate the doinst.sh script
+#find etc/asciidoc -type f -name '*.conf.new' | while read cfile ; do
+#  echo "config $cfile" >> install/doinst.sh
+#done
 
 # Now you should manually extract the .t?z
 # - check through the install/doinst.sh script;
diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.20-lib64.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.20-lib64.patch
deleted file mode 100644
index 66ff2a31e..000000000
--- a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.20-lib64.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linuxdoc-tools-0.9.60/bin/linuxdoc.in.orig
-+++ linuxdoc-tools-0.9.60/bin/linuxdoc.in
-@@ -23,6 +23,7 @@
- $AuxBinDir   = "@auxbindir@";
- 
- use lib "@pkgdatadir@";
-+use lib "@prefix@/lib64/perl5";
- use lib "@perl5libdir@";
- 
- # ---------------------------------------------------------------------
diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch
new file mode 100644
index 000000000..429de253e
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch
@@ -0,0 +1,25 @@
+From 453fa2fb9d10c2ded7a46d550592f79dd7653e39 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Sun, 5 Feb 2023 23:30:27 +0100
+Subject: [PATCH] [downstream] Added fix to have lib64 in perl path on
+ 64bit machine
+
+---
+ bin/linuxdoc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bin/linuxdoc.in b/bin/linuxdoc.in
+index 615ef06..3d3455f 100755
+--- a/bin/linuxdoc.in
++++ b/bin/linuxdoc.in
+@@ -12,6 +12,7 @@ use 5.006;
+ use strict;
+ 
+ use lib "@pkgdatadir@";
++use lib "@prefix@/lib64/perl5";
+ use lib "@perl5libdir@";
+ 
+ use LinuxDocTools::Utils qw{ldt_which};
+-- 
+2.39.1
+
diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download
index 4801ed32c..b86ef7a05 100755
--- a/source/ap/linuxdoc-tools/sources/source.download
+++ b/source/ap/linuxdoc-tools/sources/source.download
@@ -1,36 +1,44 @@
-# Extract all SRPM URLs to make it easy to download.
-# Often there's nothing that's changed between the version of the SRPM we hold, and
-# the upstream version - the version was increased due to a rebuild within Fedora.
-# However, I update our copy of the SRPM regardless, since it eases maintenance.
+# source/ap/linuxdoc-tools/sources/source.download
+# Upstream source references.
+# Stuart Winter <mozes@slackware.com>
 #
-# grep -E "^wget.*src.rpm$" source.download
-#
-
-# Incase you're wondering why we're using source RPMs, this is because
-# they contain patches required to either fix build or runtime problems,
-# and it's easier to maintain this hunk of a package when the patches &
-# sources are self contained.
+# Incase you're wondering why we're using source RPMs, this is because they contain
+# patches required to either fix build or runtime problems, and it's easier to
+# maintain this hunk of a package when the patches & sources are self contained.
 #
 # Some sources have been recompressed with LZMA for better compression results.
+#
+# Note: Due to the passage of time, certain SRPM URLs may no longer be accessible,
+# having been stored in the Slackware repository for several years. To minimise
+# unnecessary churn within in the Slackware source tree, we update the SRPMs only
+# when their content has been modified.
 
 # linuxdoc-tools:
+# "In the wild" references:
 # https://packages.debian.org/sid/linuxdoc-tools
+# https://src.fedoraproject.org/rpms/linuxdoc-tools
+# https://packages.gentoo.org/packages/app-text/linuxdoc-tools
 #
 # This provides things such as sgml2txt.
-wget http://deb.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.82.orig.tar.gz
-# We're taking some patches from here - now separated out:
-#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.68-3.fc19.src.rpm
+# This has been recompressed locally.
+wget http://deb.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.83.orig.tar.gz
+# Applied patches:
+# lib64 patch for perl path:
+# Renamed locally: linuxdoc-tools-0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch.xz
+# https://src.fedoraproject.org/rpms/linuxdoc-tools/raw/rawhide/f/0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch
 
 # OpenSP:
 # http://openjade.sourceforge.net/download.html
-# wget -c http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz
+# wget http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz
 # 
+# https://src.fedoraproject.org/rpms/opensp
 # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/
 #
-wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/opensp-1.5.2-38.fc35.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/opensp-1.5.2-38.fc35.src.rpm
 
 # OpenJade:
 # http://openjade.sourceforge.net/
+# https://src.fedoraproject.org/rpms/openjade
 # We're only using a gcc 4.6 patch from Fedora's SRPM:
 # There are other patches such as "nola" and "nsl", but we aren't using them.
 #
@@ -40,69 +48,61 @@ wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everyt
 wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/openjade-1.3.2-59.fc29.src.rpm
 
 # sgmltools-common.
-# It's broken and needs patching so we'll use Fedora's.
-#wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz
-#
+# https://src.fedoraproject.org/rpms/sgml-common
 # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/
 #
 wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/sgml-common-0.6.3-57.fc35.src.rpm
 
+# Docbook Style DSSSL:
 # http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html
-# Check versions:
+# https://src.fedoraproject.org/rpms/docbook-style-dsssl
 # http://sourceforge.net/projects/docbook/files/
-wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar.bz2
-wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2
-# Why don't they put the patches into the distributed source...???
-#wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-#
-#
+wget http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2
+
+# Docbook-utils:
+# https://src.fedoraproject.org/rpms/docbook-utils
 # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/
 #
 wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-utils-0.6.14-53.fc35.src.rpm
 #
 #
 
-
+# Docbook Style XSL
+#
+# https://src.fedoraproject.org/rpms/docbook-style-xsl
+#
 # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why
 # these "docbook-xsl*" files aren't in our sources directory.
-#wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2.tar.bz2?use_mirror=freefr"
-##wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl-doc/1.75.2/docbook-xsl-doc-1.75.2.tar.bz2?use_mirror=freefr"
+#wget "http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2.tar.bz2?use_mirror=freefr"
+##wget "http://downloads.sourceforge.net/project/docbook/docbook-xsl-doc/1.75.2/docbook-xsl-doc-1.75.2.tar.bz2?use_mirror=freefr"
 #
 # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/
 #
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-15.fc35.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-22.fc40.src.rpm
 
 # http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook.html
-wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
+wget http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
 # https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608
 #
 
 # gnome-doc-utils, needed to build gtk-doc:
-# Recompressed with LZMA after download.
-# I guess this mirror is out of date now.  It's easier to just look at Fedora's development
-# directory anyway :-)
-# wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2
+# https://src.fedoraproject.org/rpms/gnome-doc-utils
 #
 # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/
 #
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-26.fc35.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-37.fc40.src.rpm
 
 # gtk-doc:
 # There aren't any patches taken from the SRPM, but you can check the version used in Fedora
 # and see if any are being applied. We will pull the source archive from the SRPM:
 #
+# https://src.fedoraproject.org/rpms/gtk-doc
 # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/
 #
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.33.2-4.fc35.src.rpm
-https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.32-2.fc32.src.rpm
-#wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gtk-doc/1.21/gtk-doc-1.21.tar.xz
-# http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0
+wget https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.34.0-1.fc41.src.rpm
 
 # xmlto
-# https://fedorahosted.org/releases/x/m/xmlto
-# wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
-# Fedora includes a patch, so we'll take it:
-# 
+# https://src.fedoraproject.org/rpms/xmlto
 # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x
 #
 wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x/xmlto-0.0.28-12.fc31.src.rpm
@@ -110,43 +110,44 @@ wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everythin
 # AsciiDoc
 # http://www.methods.co.nz/asciidoc/ <<--- no longer updated.  Taking src from Fedora's SRPM.
 # Also http://asciidoc.org/
+# https://src.fedoraproject.org/rpms/asciidoc
 # Taken some patches from Fedora.
 # 
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-9.1.0-3.fc35.src.rpm
+wget https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-10.2.0-9.fc40.src.rpm
 
 # docbook2X:
 #
 # Pre-requisite PERL modules for docbook2X:
 # https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/
 #
+# https://src.fedoraproject.org/rpms/perl-XML-NamespaceSupport
 wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-NamespaceSupport-1.12-15.fc35.src.rpm
+# https://src.fedoraproject.org/rpms/perl-XML-SAX
 wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-1.02-8.fc35.src.rpm
+# https://src.fedoraproject.org/rpms/perl-XML-SAX-Base
 wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-Base-1.09-15.fc35.src.rpm
 
-
-
 # sgmlspl
 # http://www.cs.indiana.edu/~asengupt/sgml/SGMLSpm/DOC/HTML/sgmlspl/sgmlspl.html
 # http://packages.debian.org/search?keywords=sgmlspl&searchon=names&suite=all&section=all
 # There's nothing in the FTP download site at this time, so I'll take it from Debian.
-wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz
-wget -c http://http.debian.net/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-36.debian.tar.xz
-
+wget http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz
+wget http://http.debian.net/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-36.debian.tar.xz
 #
 #http://packages.debian.org/sid/docbook2x
 # Fedora keep it here, but Debian have a couple of (what look to be useful) patches.
-#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook2X-0.8.8-14.fc19.src.rpm
+#wget ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook2X-0.8.8-14.fc19.src.rpm
 #
 # https://packages.debian.org/search?keywords=docbook2x&searchon=names&suite=all&section=all
-wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8.orig.tar.gz
+wget http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8.orig.tar.gz
 wget http://deb.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8-17.debian.tar.xz
 
 # DocBook docs:
 # http://www.oasis-open.org/docbook/sgml/
 #
-#wget -c http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
-#wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip
+#wget http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
+#wget http://www.docbook.org/sgml/4.5/docbook-4.5.zip
 # We use Debian's source because it's more convenient since they package all versions in one archive:
 # https://packages.debian.org/search?keywords=docbook&searchon=names&suite=all&section=all
-wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz
+wget http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz
 #
diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
index 35cd3e071..cd280da63 100755
--- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
+++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
@@ -21,8 +21,8 @@
 # Package info:
 PKGNAM=linuxdoc-tools
 
-export PKGVERSION=0.9.82 # use the version of linuxdoc-tools as the package version.
-BUILD=${BUILD:-5}
+export PKGVERSION=0.9.83 # use the version of linuxdoc-tools as the package version.
+BUILD=${BUILD:-1}
 PKGEXT=${PKGEXT:-txz}
 
 # Automatically determine the architecture we're building on:
@@ -67,8 +67,8 @@ rm -rf ~/.texlive*   # incase you were using Texlive rather than Textex-3
 # but is slower.  However, if you really want extra speed, copy
 # this entire package source directory to a temporary location
 # and run it from there.
+# This is the recommended option to use during development cycles:
 # TFS="--touch-filesystem-faster"
-
 TFS="--touch-filesystem-first"
 
 # Launch the build script:
diff --git a/source/l/Mako/Mako.SlackBuild b/source/l/Mako/Mako.SlackBuild
index 619405354..95a42a341 100755
--- a/source/l/Mako/Mako.SlackBuild
+++ b/source/l/Mako/Mako.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=Mako
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xcb-proto
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xcb-proto
+++ b/source/x/x11/build/xcb-proto
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/src/xf86-input-wacom.url b/source/x/x11/src/xf86-input-wacom.url
index 6dd650d65..53b87de6f 100644
--- a/source/x/x11/src/xf86-input-wacom.url
+++ b/source/x/x11/src/xf86-input-wacom.url
@@ -1,2 +1,2 @@
 https://github.com/linuxwacom/xf86-input-wacom
-https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-1.2.1/xf86-input-wacom-1.2.1.tar.bz2
+https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-1.2.2/xf86-input-wacom-1.2.2.tar.bz2