Fri Oct 15 20:47:13 UTC 202120211015204713

ap/htop-3.1.1-x86_64-1.txz:  Upgraded.
d/automake-1.16.2-noarch-4.txz:  Rebuilt.
  The GNU toolchain is making it increasingly impossible to use our usual
  "${ARCH}-slackware-linux" host, erroring out with a host mismatch on at
  least GTK+2. So, we'll drop back to this version of automake for now,
  with a fix applied for detecting Python 3.10. More than likely we'll be
  changing the host to "${ARCH}-slackware-linux-gnu" to satisfy upstream,
  but that will have to wait for the next devel cycle.
d/llvm-13.0.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/rust-1.55.0-x86_64-2.txz:  Rebuilt.
  Recompiled against llvm-13.0.0.
kde/kdevelop-5.6.2-x86_64-6.txz:  Rebuilt.
  Recompiled against llvm-13.0.0.
kde/plasma-workspace-5.23.0-x86_64-2.txz:  Rebuilt.
  Applied upstream patch:
  [PATCH] sddm-theme: fix missing password field on "Other" page.
  Thanks to USUARIONUEVO and LuckyCyborg.
l/libclc-13.0.0-x86_64-1.txz:  Upgraded.
  Recompiled against llvm-13.0.0.
l/python-pillow-8.4.0-x86_64-1.txz:  Upgraded.
l/qt5-5.15.3_20211013_5c7c3af5-x86_64-1.txz:  Upgraded.
  Upgraded to latest git (might as well) and compiled against llvm-13.0.0.
l/spirv-llvm-translator-20210920_098034ea-x86_64-1.txz:  Upgraded.
  Recompiled against llvm-13.0.0.
x/mesa-21.2.4-x86_64-1.txz:  Upgraded.
  Compiled against llvm-13.0.0.
xap/pidgin-2.14.8-x86_64-1.txz:  Upgraded.

6 files changed, 62 insertions, 38 deletions

diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild
index 962d106bd..6fbc3b063 100755
--- a/source/d/automake/automake.SlackBuild
+++ b/source/d/automake/automake.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=automake
 VERSION=${VERSION:-$(echo automake-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 
 # Note: the package is _built_ as 'noarch'
 # Automatically determine architecture for build & packaging:
@@ -63,6 +63,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
+# Python detection fix for 3.10:
+zcat $CWD/automake.python.3.10.diff.gz | patch -p1 --verbose || exit 1
+
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
diff --git a/source/d/automake/automake.python.3.10.diff b/source/d/automake/automake.python.3.10.diff
new file mode 100644
index 000000000..02dd7348f
--- /dev/null
+++ b/source/d/automake/automake.python.3.10.diff
@@ -0,0 +1,22 @@
+--- ./m4/python.m4.orig	2020-01-01 13:43:28.000000000 -0600
++++ ./m4/python.m4	2021-10-15 11:40:40.523668203 -0500
+@@ -86,12 +86,14 @@
+     m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+   else
+ 
+-  dnl Query Python for its version number.  Getting [:3] seems to be
+-  dnl the best way to do this; it's what "site.py" does in the standard
+-  dnl library.
+-
++  dnl Query Python for its version number.  Although site.py simply uses
++  dnl sys.version[:3], printing that failed with Python 3.10, since the
++  dnl trailing zero was eliminated. So now we output just the major
++  dnl and minor version numbers, as numbers. Apparently the tertiary
++  dnl version is not of interest.
++  dnl
+   AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+-    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
++    [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
+   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+ 
+   dnl Use the values of $prefix and $exec_prefix for the corresponding
diff --git a/source/d/llvm/clang.toolchains.i586.triple.diff b/source/d/llvm/clang.toolchains.i586.triple.diff
index cbdc82ac7..90e66c55e 100644
--- a/source/d/llvm/clang.toolchains.i586.triple.diff
+++ b/source/d/llvm/clang.toolchains.i586.triple.diff
@@ -1,11 +1,10 @@
---- ./tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig	2019-01-15 15:04:36.000000000 -0600
-+++ ./tools/clang/lib/Driver/ToolChains/Gnu.cpp	2019-03-20 13:18:48.828439494 -0500
-@@ -1903,7 +1903,7 @@
-       "i686-linux-gnu",       "i686-pc-linux-gnu",     "i486-linux-gnu",
-       "i386-linux-gnu",       "i386-redhat-linux6E",   "i686-redhat-linux",
-       "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
--      "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
-+      "i486-slackware-linux", "i586-slackware-linux",  "i686-slackware-linux",  "i686-montavista-linux", "i586-linux-gnu",
-       "i686-linux-android",   "i386-gnu",              "i486-gnu",
-       "i586-gnu",             "i686-gnu"};
- 
+--- ./tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig	2021-09-24 11:18:10.000000000 -0500
++++ ./tools/clang/lib/Driver/ToolChains/Gnu.cpp	2021-10-05 14:17:02.597518687 -0500
+@@ -2114,6 +2114,7 @@
+       "i586-linux-gnu",     "i686-linux-gnu",
+       "i686-pc-linux-gnu",  "i386-redhat-linux6E",
+       "i686-redhat-linux",  "i386-redhat-linux",
++      "i586-slackware-linux",  "i686-slackware-linux",
+       "i586-suse-linux",    "i686-montavista-linux",
+       "i686-linux-android", "i686-gnu",
+   };
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 3be521a67..f2f1ab094 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=llvm
 VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index eeafb0963..835dd1816 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,25 +1,25 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/llvm-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang-tools-extra-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/compiler-rt-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/flang-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/lldb-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/openmp-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/polly-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/libcxx-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/libcxxabi-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/lld-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/libunwind-12.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/llvm-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang-tools-extra-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/compiler-rt-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/flang-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/lldb-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/openmp-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/polly-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/libcxx-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/libcxxabi-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/lld-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/libunwind-13.0.0.src.tar.xz
 
-#http://llvm.org/releases/12.0.1/llvm-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/clang-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/clang-tools-extra-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/compiler-rt-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/flang-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/lldb-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/openmp-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/polly-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/libcxx-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/libcxxabi-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/lld-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/libunwind-12.0.1.src.tar.xz
+#http://llvm.org/releases/13.0.0/llvm-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/clang-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/clang-tools-extra-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/compiler-rt-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/flang-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/lldb-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/openmp-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/polly-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/libcxx-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/libcxxabi-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/lld-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/libunwind-13.0.0.src.tar.xz
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 0000ae3a9..286c7bd1f 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=rust
 SRCNAM="${PKGNAM}c"
 VERSION=${VERSION:-1.55.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
 # YES is probably better (when it works...)