Fri May 14 02:38:35 UTC 202120210514023835

ap/vim-8.2.2850-x86_64-1.txz:  Upgraded.
d/llvm-12.0.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/rust-1.52.1-x86_64-1.txz:  Upgraded.
kde/akonadi-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadi-calendar-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadi-calendar-tools-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadi-contacts-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadi-import-wizard-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadi-mime-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadi-notes-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadi-search-21.04.1-x86_64-1.txz:  Upgraded.
kde/akonadiconsole-21.04.1-x86_64-1.txz:  Upgraded.
kde/akregator-21.04.1-x86_64-1.txz:  Upgraded.
kde/analitza-21.04.1-x86_64-1.txz:  Upgraded.
kde/ark-21.04.1-x86_64-1.txz:  Upgraded.
kde/artikulate-21.04.1-x86_64-1.txz:  Upgraded.
kde/audiocd-kio-21.04.1-x86_64-1.txz:  Upgraded.
kde/baloo-widgets-21.04.1-x86_64-1.txz:  Upgraded.
kde/blinken-21.04.1-x86_64-1.txz:  Upgraded.
kde/bomber-21.04.1-x86_64-1.txz:  Upgraded.
kde/bovo-21.04.1-x86_64-1.txz:  Upgraded.
kde/calendarsupport-21.04.1-x86_64-1.txz:  Upgraded.
kde/cantor-21.04.1-x86_64-1.txz:  Upgraded.
kde/cervisia-21.04.1-x86_64-1.txz:  Upgraded.
kde/dolphin-21.04.1-x86_64-1.txz:  Upgraded.
kde/dolphin-plugins-21.04.1-x86_64-1.txz:  Upgraded.
kde/dragon-21.04.1-x86_64-1.txz:  Upgraded.
kde/elisa-21.04.1-x86_64-1.txz:  Upgraded.
kde/eventviews-21.04.1-x86_64-1.txz:  Upgraded.
kde/ffmpegthumbs-21.04.1-x86_64-1.txz:  Upgraded.
kde/filelight-21.04.1-x86_64-1.txz:  Upgraded.
kde/granatier-21.04.1-x86_64-1.txz:  Upgraded.
kde/grantlee-editor-21.04.1-x86_64-1.txz:  Upgraded.
kde/grantleetheme-21.04.1-x86_64-1.txz:  Upgraded.
kde/gwenview-21.04.1-x86_64-1.txz:  Upgraded.
kde/incidenceeditor-21.04.1-x86_64-1.txz:  Upgraded.
kde/itinerary-21.04.1-x86_64-1.txz:  Upgraded.
kde/juk-21.04.1-x86_64-1.txz:  Upgraded.
kde/k3b-21.04.1-x86_64-1.txz:  Upgraded.
kde/kaddressbook-21.04.1-x86_64-1.txz:  Upgraded.
kde/kalarm-21.04.1-x86_64-1.txz:  Upgraded.
kde/kalarmcal-21.04.1-x86_64-1.txz:  Upgraded.
kde/kalgebra-21.04.1-x86_64-1.txz:  Upgraded.
kde/kalzium-21.04.1-x86_64-1.txz:  Upgraded.
kde/kamera-21.04.1-x86_64-1.txz:  Upgraded.
kde/kamoso-21.04.1-x86_64-1.txz:  Upgraded.
kde/kanagram-21.04.1-x86_64-1.txz:  Upgraded.
kde/kapman-21.04.1-x86_64-1.txz:  Upgraded.
kde/kapptemplate-21.04.1-x86_64-1.txz:  Upgraded.
kde/kate-21.04.1-x86_64-1.txz:  Upgraded.
kde/katomic-21.04.1-x86_64-1.txz:  Upgraded.
kde/kbackup-21.04.1-x86_64-1.txz:  Upgraded.
kde/kblackbox-21.04.1-x86_64-1.txz:  Upgraded.
kde/kblocks-21.04.1-x86_64-1.txz:  Upgraded.
kde/kbounce-21.04.1-x86_64-1.txz:  Upgraded.
kde/kbreakout-21.04.1-x86_64-1.txz:  Upgraded.
kde/kbruch-21.04.1-x86_64-1.txz:  Upgraded.
kde/kcachegrind-21.04.1-x86_64-1.txz:  Upgraded.
kde/kcalc-21.04.1-x86_64-1.txz:  Upgraded.
kde/kcalutils-21.04.1-x86_64-1.txz:  Upgraded.
kde/kcharselect-21.04.1-x86_64-1.txz:  Upgraded.
kde/kcolorchooser-21.04.1-x86_64-1.txz:  Upgraded.
kde/kcron-21.04.1-x86_64-1.txz:  Upgraded.
kde/kde-dev-scripts-21.04.1-x86_64-1.txz:  Upgraded.
kde/kde-dev-utils-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdebugsettings-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdeconnect-kde-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdeedu-data-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdegraphics-mobipocket-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdegraphics-thumbnailers-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdenetwork-filesharing-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdenlive-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdepim-addons-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdepim-runtime-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdesdk-kioslaves-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdesdk-thumbnailers-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdevelop-5.6.2-x86_64-4.txz:  Rebuilt.
  Recompiled against llvm-12.0.0.
kde/kdf-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdialog-21.04.1-x86_64-1.txz:  Upgraded.
kde/kdiamond-21.04.1-x86_64-1.txz:  Upgraded.
kde/keditbookmarks-21.04.1-x86_64-1.txz:  Upgraded.
kde/kfind-21.04.1-x86_64-1.txz:  Upgraded.
kde/kfloppy-21.04.1-x86_64-1.txz:  Upgraded.
kde/kfourinline-21.04.1-x86_64-1.txz:  Upgraded.
kde/kgeography-21.04.1-x86_64-1.txz:  Upgraded.
kde/kget-21.04.1-x86_64-1.txz:  Upgraded.
kde/kgoldrunner-21.04.1-x86_64-1.txz:  Upgraded.
kde/kgpg-21.04.1-x86_64-1.txz:  Upgraded.
kde/khangman-21.04.1-x86_64-1.txz:  Upgraded.
kde/khelpcenter-21.04.1-x86_64-1.txz:  Upgraded.
kde/kidentitymanagement-21.04.1-x86_64-1.txz:  Upgraded.
kde/kig-21.04.1-x86_64-1.txz:  Upgraded.
kde/kigo-21.04.1-x86_64-1.txz:  Upgraded.
kde/killbots-21.04.1-x86_64-1.txz:  Upgraded.
kde/kimagemapeditor-21.04.1-x86_64-1.txz:  Upgraded.
kde/kimap-21.04.1-x86_64-1.txz:  Upgraded.
kde/kio-extras-21.04.1-x86_64-1.txz:  Upgraded.
kde/kio-gdrive-21.04.1-x86_64-1.txz:  Upgraded.
kde/kipi-plugins-21.04.1-x86_64-1.txz:  Upgraded.
kde/kirigami-gallery-21.04.1-x86_64-1.txz:  Upgraded.
kde/kiriki-21.04.1-x86_64-1.txz:  Upgraded.
kde/kiten-21.04.1-x86_64-1.txz:  Upgraded.
kde/kitinerary-21.04.1-x86_64-1.txz:  Upgraded.
kde/kjumpingcube-21.04.1-x86_64-1.txz:  Upgraded.
kde/kldap-21.04.1-x86_64-1.txz:  Upgraded.
kde/kleopatra-21.04.1-x86_64-1.txz:  Upgraded.
kde/klickety-21.04.1-x86_64-1.txz:  Upgraded.
kde/klines-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmag-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmahjongg-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmail-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmail-account-wizard-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmailtransport-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmbox-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmime-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmines-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmix-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmousetool-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmouth-21.04.1-x86_64-1.txz:  Upgraded.
kde/kmplot-21.04.1-x86_64-1.txz:  Upgraded.
kde/knavalbattle-21.04.1-x86_64-1.txz:  Upgraded.
kde/knetwalk-21.04.1-x86_64-1.txz:  Upgraded.
kde/knights-21.04.1-x86_64-1.txz:  Upgraded.
kde/knotes-21.04.1-x86_64-1.txz:  Upgraded.
kde/kolf-21.04.1-x86_64-1.txz:  Upgraded.
kde/kollision-21.04.1-x86_64-1.txz:  Upgraded.
kde/kolourpaint-21.04.1-x86_64-1.txz:  Upgraded.
kde/kompare-21.04.1-x86_64-1.txz:  Upgraded.
kde/konqueror-21.04.1-x86_64-1.txz:  Upgraded.
kde/konquest-21.04.1-x86_64-1.txz:  Upgraded.
kde/konsole-21.04.1-x86_64-1.txz:  Upgraded.
kde/kontact-21.04.1-x86_64-1.txz:  Upgraded.
kde/kontactinterface-21.04.1-x86_64-1.txz:  Upgraded.
kde/kontrast-21.04.1-x86_64-1.txz:  Upgraded.
kde/konversation-21.04.1-x86_64-1.txz:  Upgraded.
kde/kopeninghours-21.04.1-x86_64-1.txz:  Upgraded.
kde/kopete-21.04.1-x86_64-1.txz:  Upgraded.
kde/korganizer-21.04.1-x86_64-1.txz:  Upgraded.
kde/kosmindoormap-21.04.1-x86_64-1.txz:  Upgraded.
kde/kpat-21.04.1-x86_64-1.txz:  Upgraded.
kde/kpimtextedit-21.04.1-x86_64-1.txz:  Upgraded.
kde/kpkpass-21.04.1-x86_64-1.txz:  Upgraded.
kde/kpmcore-21.04.1-x86_64-1.txz:  Upgraded.
kde/kpublictransport-21.04.1-x86_64-1.txz:  Upgraded.
kde/kqtquickcharts-21.04.1-x86_64-1.txz:  Upgraded.
kde/krdc-21.04.1-x86_64-1.txz:  Upgraded.
kde/kreversi-21.04.1-x86_64-1.txz:  Upgraded.
kde/krfb-21.04.1-x86_64-1.txz:  Upgraded.
kde/kross-interpreters-21.04.1-x86_64-1.txz:  Upgraded.
kde/kruler-21.04.1-x86_64-1.txz:  Upgraded.
kde/kshisen-21.04.1-x86_64-1.txz:  Upgraded.
kde/ksirk-21.04.1-x86_64-1.txz:  Upgraded.
kde/ksmtp-21.04.1-x86_64-1.txz:  Upgraded.
kde/ksnakeduel-21.04.1-x86_64-1.txz:  Upgraded.
kde/kspaceduel-21.04.1-x86_64-1.txz:  Upgraded.
kde/ksquares-21.04.1-x86_64-1.txz:  Upgraded.
kde/ksudoku-21.04.1-x86_64-1.txz:  Upgraded.
kde/ksystemlog-21.04.1-x86_64-1.txz:  Upgraded.
kde/kteatime-21.04.1-x86_64-1.txz:  Upgraded.
kde/ktimer-21.04.1-x86_64-1.txz:  Upgraded.
kde/ktnef-21.04.1-x86_64-1.txz:  Upgraded.
kde/ktorrent-21.04.1-x86_64-1.txz:  Upgraded.
kde/ktouch-21.04.1-x86_64-1.txz:  Upgraded.
kde/kturtle-21.04.1-x86_64-1.txz:  Upgraded.
kde/kubrick-21.04.1-x86_64-1.txz:  Upgraded.
kde/kwalletmanager-21.04.1-x86_64-1.txz:  Upgraded.
kde/kwave-21.04.1-x86_64-1.txz:  Upgraded.
kde/kwordquiz-21.04.1-x86_64-1.txz:  Upgraded.
kde/libgravatar-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkcddb-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkcompactdisc-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkdcraw-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkdegames-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkdepim-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkeduvocdocument-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkexiv2-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkgapi-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkipi-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkleo-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkmahjongg-21.04.1-x86_64-1.txz:  Upgraded.
kde/libkomparediff2-21.04.1-x86_64-1.txz:  Upgraded.
kde/libksane-21.04.1-x86_64-1.txz:  Upgraded.
kde/libksieve-21.04.1-x86_64-1.txz:  Upgraded.
kde/libktorrent-21.04.1-x86_64-1.txz:  Upgraded.
kde/lokalize-21.04.1-x86_64-1.txz:  Upgraded.
kde/lskat-21.04.1-x86_64-1.txz:  Upgraded.
kde/mailcommon-21.04.1-x86_64-1.txz:  Upgraded.
kde/mailimporter-21.04.1-x86_64-1.txz:  Upgraded.
kde/marble-21.04.1-x86_64-1.txz:  Upgraded.
kde/markdownpart-21.04.1-x86_64-1.txz:  Upgraded.
kde/mbox-importer-21.04.1-x86_64-1.txz:  Upgraded.
kde/messagelib-21.04.1-x86_64-1.txz:  Upgraded.
kde/minuet-21.04.1-x86_64-1.txz:  Upgraded.
kde/okular-21.04.1-x86_64-1.txz:  Upgraded.
kde/palapeli-21.04.1-x86_64-1.txz:  Upgraded.
kde/parley-21.04.1-x86_64-1.txz:  Upgraded.
kde/partitionmanager-21.04.1-x86_64-1.txz:  Upgraded.
kde/picmi-21.04.1-x86_64-1.txz:  Upgraded.
kde/pim-data-exporter-21.04.1-x86_64-1.txz:  Upgraded.
kde/pim-sieve-editor-21.04.1-x86_64-1.txz:  Upgraded.
kde/pimcommon-21.04.1-x86_64-1.txz:  Upgraded.
kde/poxml-21.04.1-x86_64-1.txz:  Upgraded.
kde/print-manager-21.04.1-x86_64-1.txz:  Upgraded.
kde/rocs-21.04.1-x86_64-1.txz:  Upgraded.
kde/spectacle-21.04.1-x86_64-1.txz:  Upgraded.
kde/step-21.04.1-x86_64-1.txz:  Upgraded.
kde/svgpart-21.04.1-x86_64-1.txz:  Upgraded.
kde/sweeper-21.04.1-x86_64-1.txz:  Upgraded.
kde/umbrello-21.04.1-x86_64-1.txz:  Upgraded.
kde/yakuake-21.04.1-x86_64-1.txz:  Upgraded.
kde/zeroconf-ioslave-21.04.1-x86_64-1.txz:  Upgraded.
l/libidn2-2.3.1-x86_64-1.txz:  Upgraded.
l/libtasn1-4.17.0-x86_64-1.txz:  Upgraded.
l/qt5-5.15.2-x86_64-9.txz:  Rebuilt.
  Recompiled against llvm-12.0.0.
x/egl-wayland-1.1.7-x86_64-1.txz:  Upgraded.
x/mesa-21.1.0-x86_64-2.txz:  Rebuilt.
  Recompiled against llvm-12.0.0.
xap/vim-gvim-8.2.2850-x86_64-1.txz:  Upgraded.

4 files changed, 74 insertions, 48 deletions

diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 826a47927..e9ac03b50 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for llvm
 
 # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -39,6 +39,29 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# Building clangd will be determined automatically unless BUILD_CLANG is
+# preset to YES or NO:
+if [ -z $BUILD_CLANGD ]; then
+  if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then
+    BUILD_CLANGD=NO
+  else
+    BUILD_CLANGD=YES
+  fi
+fi
+if [ "$BUILD_CLANGD" = "NO" ]; then
+  CLANGD="-DCLANG_ENABLE_CLANGD=OFF"
+fi
+
+# Building lld will be determined automatically unless BUILD_LLD is
+# preset to YES or NO:
+if [ -z $BUILD_LLD ]; then
+  if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then
+    BUILD_LLD=NO
+  else
+    BUILD_LLD=YES
+  fi
+fi
+
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
@@ -74,7 +97,7 @@ PY3=$(python3 -c 'from distutils.sysconfig import get_python_lib; print(get_pyth
 # <linux/types.h> are defined, even though they are. gcc/g++ seem unaffected.
 # For now, not much choice other than to disable this.
 # Don't use icecream:
-PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+#PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
@@ -89,14 +112,19 @@ cd $PKGNAM-${VERSION}/tools || cd $PKGNAM-${VERSION}.src/tools || exit 1
   #mv flang-${VERSION} flang 2>/dev/null || mv flang-${VERSION}.src flang || exit 1
   tar xvf $CWD/lldb-$VERSION.src.tar.xz || exit 1
   mv lldb-${VERSION} lldb 2>/dev/null || mv lldb-${VERSION}.src lldb || exit 1
-  tar xvf $CWD/lld-$VERSION.src.tar.xz || exit 1
-  mv lld-${VERSION} lld 2>/dev/null || mv lld-${VERSION}.src lld || exit 1
+  if [ "$BUILD_CLANGD" = "YES" ]; then
+    tar xvf $CWD/lld-$VERSION.src.tar.xz || exit 1
+    mv lld-${VERSION} lld 2>/dev/null || mv lld-${VERSION}.src lld || exit 1
+  fi
 cd ../
 
 cd tools/clang/tools || exit 1
   tar xvf $CWD/clang-tools-extra-$VERSION.src.tar.xz || exit 1
   mv clang-tools-extra-${VERSION} extra 2>/dev/null \
     || mv clang-tools-extra-${VERSION}.src extra || exit 1
+  # HACK # Otherwise the build fails because files aren't found.
+  rm -rf $TMP/clang-tools-extra
+  cp -a extra $TMP/clang-tools-extra
 cd ../../../
 
 cd projects || exit 1
@@ -110,6 +138,9 @@ cd projects || exit 1
   mv libcxxabi-${VERSION} libcxxabi 2>/dev/null || mv libcxxabi-${VERSION}.src libcxxabi || exit 1
   tar xvf $CWD/polly-$VERSION.src.tar.xz || exit 1
   mv polly-${VERSION} polly 2>/dev/null || mv polly-${VERSION}.src polly || exit 1
+  # We just need a header file from this...
+  tar xvf $CWD/libunwind-${VERSION}.src.tar.xz || exit 1
+  mv libunwind-${VERSION} libunwind || mv libunwind-${VERSION}.src libunwind || exit 1
 cd ../
 
 # Support GCC built for i586-slackware-linux:
@@ -118,17 +149,6 @@ zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p1 --verbose || exit 1
 # Hack to fix build with polly. Maybe we should just not use polly... ?
 zcat $CWD/llvm.polly.hack.diff.gz | patch -p1 --verbose || exit 1
 
-# As of clang-tools-extra-7.0.0 we get the following error on i586 or i686:
-# CMakeFiles/clangDaemon.dir/Trace.cpp.o:Trace.cpp:function std::unique_ptr<clang::clangd::trace::(anonymous namespace)::JSONTracer::JSONSpan, std::default_delete<clang::clangd::trace::(anonymous namespace)::JSONTracer::JSONSpan> >::~unique_ptr(): error: undefined reference to '__atomic_load_8'
-# Attempts to try to fix this have failed here, so for now we will not build
-# clangd to avoid the failure. Any help with a proper fix is appreciated.
-# I have not reported this upstream since I suspect that it's an artifact
-# of our convoluted build method.
-case $ARCH in
-  i?86) CLANGD="-DCLANG_ENABLE_CLANGD=OFF" ;;
-     *) unset CLANGD ;;
-esac
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -138,6 +158,11 @@ find . \
 
 mkdir build
 cd build
+  mkdir include
+  # Copy this LLVM libunwind header or it won't be found:
+  cp -a ../projects/libunwind/include/mach-o include
+  # Nuke LLVM libunwind as it conflicts with the one already on the system:
+  rm -r ../projects/libunwind
   cmake -GNinja \
     -DCMAKE_C_COMPILER="clang" \
     -DCMAKE_CXX_COMPILER="clang++" \
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index c18b45b10..f363460dc 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,23 +1,25 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/llvm-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/clang-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/clang-tools-extra-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/compiler-rt-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/flang-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/lldb-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/openmp-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/polly-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/libcxx-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/libcxxabi-11.1.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/lld-11.1.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/llvm-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/clang-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/clang-tools-extra-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/compiler-rt-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/flang-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/lldb-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/openmp-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/polly-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/libcxx-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/libcxxabi-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/lld-12.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/libunwind-12.0.0.src.tar.xz
 
-#http://llvm.org/releases/11.1.0/llvm-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/clang-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/clang-tools-extra-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/compiler-rt-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/flang-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/lldb-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/openmp-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/polly-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/libcxx-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/libcxxabi-11.1.0.src.tar.xz
-#http://llvm.org/releases/11.1.0/lld-11.1.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/llvm-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/clang-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/clang-tools-extra-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/compiler-rt-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/flang-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/lldb-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/openmp-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/polly-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/libcxx-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/libcxxabi-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/lld-12.0.0.src.tar.xz
+#http://llvm.org/releases/12.0.0/libunwind-12.0.0.src.tar.xz
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 7c045f4b9..99b86d080 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rust
 SRCNAM="${PKGNAM}c"
-VERSION=${VERSION:-1.51.0}
+VERSION=${VERSION:-1.52.1}
 BUILD=${BUILD:-1}
 
 # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
@@ -34,9 +34,9 @@ BUILD=${BUILD:-1}
 SYSTEM_LLVM=${SYSTEM_LLVM:-YES}
 
 # Bootstrap variables (might not be kept updated for latest Rust):
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.50.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2021-02-11}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.50.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.51.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2021-03-25}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.51.0}
 CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
 
 # Automatically determine the architecture we're building on:
@@ -232,8 +232,8 @@ elif [ "$BARCH" = "i686" ] ; then
 fi
 
 # Build and install:
-python x.py dist  || exit 1
-DESTDIR=$PKG python x.py install || exit 1
+python3 x.py dist  || exit 1
+DESTDIR=$PKG python3 x.py install || exit 1
 
 # Eh, none of this is all that big. Might as well leave it around as a
 # reference.
diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url
index d4f76ed3d..b77baf645 100644
--- a/source/d/rust/rust.url
+++ b/source/d/rust/rust.url
@@ -1,5 +1,5 @@
 # Source code (repacked to .tar.lz):
-VERSION=1.51.0
+VERSION=1.52.1
 rm -f rustc-${VERSION}-src.tar.*
 lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz
 lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc
@@ -20,9 +20,9 @@ fi
 # update the settings below, look at src/stage0.txt in the Rust sources.
 exit 0
 
-BOOTSTRAP_DATE=2021-02-11
-BOOTSTRAP_CARGO=1.50.0
-BOOTSTRAP_VERSION=1.50.0
+BOOTSTRAP_DATE=2021-03-25
+BOOTSTRAP_CARGO=1.51.0
+BOOTSTRAP_VERSION=1.51.0
 
 # i686 bootstrap:
 lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.gz
@@ -33,4 +33,3 @@ lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VE
 lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-x86_64-unknown-linux-gnu.tar.gz
 lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
 lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
-