Sun Jan 16 07:23:29 UTC 202220220116072329

a/aaa_base-15.0-x86_64-3.txz:  Rebuilt.
  In initial email to root, use the new /var/lib/pkgtools/ paths to the files
  for packages and scripts. Thanks to franzen.
a/btrfs-progs-5.16-x86_64-1.txz:  Upgraded.
d/python3-3.9.10-x86_64-1.txz:  Upgraded.
d/rust-1.58.0-x86_64-1.txz:  Upgraded.
kde/digikam-7.5.0-x86_64-1.txz:  Upgraded.
kde/kglobalaccel-5.90.0-x86_64-2.txz:  Rebuilt.
  Applied patch:
  [PATCH] Prevent kglobalaccel5 getting activated on non-Plasma systems.
  Although this patch was later reverted, I'm on board with the need for it.
  If it causes any problems, please let me know soon.
  Thanks to Lockywolf.
kde/kid3-3.9.1-x86_64-1.txz:  Upgraded.
kde/plasma-wayland-protocols-1.6.0-x86_64-1.txz:  Upgraded.
kde/sddm-0.19.0-x86_64-10.txz:  Rebuilt.
  Allow the init program to properly supervise sddm when entering runlevel 4.
  Thanks to mumahendras3.
l/neon-0.32.2-x86_64-1.txz:  Upgraded.
l/netpbm-10.97.02-x86_64-1.txz:  Upgraded.
n/postfix-3.6.4-x86_64-1.txz:  Upgraded.
x/mesa-21.3.4-x86_64-1.txz:  Upgraded.
x/xterm-370-x86_64-2.txz:  Rebuilt.
  Use upstream app-defaults again. Thanks to OldHolborn.

12 files changed, 267 insertions, 28 deletions

diff --git a/source/a/aaa_base/_aaa_base/var/spool/mail/root.new b/source/a/aaa_base/_aaa_base/var/spool/mail/root.new
index 073e57a7..c1872523 100644
--- a/source/a/aaa_base/_aaa_base/var/spool/mail/root.new
+++ b/source/a/aaa_base/_aaa_base/var/spool/mail/root.new
@@ -23,12 +23,12 @@ Tools to help configure your system:
 installing? You can see all that information (and more) again. The
 simplest way is to use the 'pkgtool' utility to view the package
 contents. Another way is to use 'less' or a text editor to read the
-files in /var/log/packages and /var/log/scripts (this is the method I
-use). The pkgtool script serves as a frontend to the command line
-package tools, so it's a menu based program that will enable you to
-remove, install, or view packages that are currently installed on the
-system. pkgtool will also allow you to re-run some of the system admin
-scripts that you may have seen during the installation process.
+files in /var/lib/pkgtools/packages and /var/lib/pkgtools/scripts (this
+is the method I use). The pkgtool script serves as a frontend to the
+command line package tools, so it's a menu based program that will enable
+you to remove, install, or view packages that are currently installed on
+the system. pkgtool will also allow you to re-run some of the system
+admin scripts that you may have seen during the installation process.
 
    Slackware's command line package tools: I use these utilities most
 of the time when I have packages to install, remove, or upgrade. These
diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild
index 2632153d..d17731e9 100755
--- a/source/a/aaa_base/aaa_base.SlackBuild
+++ b/source/a/aaa_base/aaa_base.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_base
 VERSION=15.0
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild
index b1090dd8..c437325c 100755
--- a/source/d/python3/python3.SlackBuild
+++ b/source/d/python3/python3.SlackBuild
@@ -29,7 +29,7 @@ PKGNAM=python3
 SRCNAM=Python
 VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 0d73d2f4..34fe2f2b 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.57.0}
+VERSION=${VERSION:-1.58.0}
 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.56.1}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2021-11-01}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.56.1}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.57.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2021-12-02}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.57.0}
 CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url
index 7f5173fc..1a7d0b98 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.57.0
+VERSION=1.58.0
 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
@@ -17,12 +17,12 @@ fi
 # should be able to compile the next released version of Rust.
 #
 # To find the expected date/versions for bootstrap binaries to be able to
-# update the settings below, look at src/stage0.txt in the Rust sources.
+# update the settings below, look at src/stage0.json in the Rust sources.
 exit 0
 
-BOOTSTRAP_DATE=2021-11-01
-BOOTSTRAP_CARGO=1.56.1
-BOOTSTRAP_VERSION=1.56.1
+BOOTSTRAP_DATE=2021-12-02
+BOOTSTRAP_VERSION=1.57.0
+BOOTSTRAP_CARGO=$BOOTSTRAP_VERSION
 
 # i686 bootstrap:
 lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.xz
diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam
index 0cfbf088..d00491fd 100644
--- a/source/kde/kde/build/digikam
+++ b/source/kde/kde/build/digikam
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kglobalaccel b/source/kde/kde/build/kglobalaccel
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kglobalaccel
+++ b/source/kde/kde/build/kglobalaccel
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/sddm b/source/kde/kde/build/sddm
index ec635144..f599e28b 100644
--- a/source/kde/kde/build/sddm
+++ b/source/kde/kde/build/sddm
@@ -1 +1 @@
-9
+10
diff --git a/source/kde/kde/patch/kglobalaccel.patch b/source/kde/kde/patch/kglobalaccel.patch
new file mode 100644
index 00000000..a7dfeb06
--- /dev/null
+++ b/source/kde/kde/patch/kglobalaccel.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch b/source/kde/kde/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch
new file mode 100644
index 00000000..05b2f2c5
--- /dev/null
+++ b/source/kde/kde/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch
@@ -0,0 +1,235 @@
+From 48c3376927e5e9c13377bf3cfc8b0c411783e7f3 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 10 Apr 2021 17:08:58 +0200
+Subject: [PATCH] Prevent kglobalaccel5 getting activated on non-Plasma systems
+
+While in theory kglobalaccel works on any X11 system we don't want it to run on non-Plasma systems. It isn't very useful and may interfere with the desktop's native shortcut system.
+
+Calling some API of KGlobalAccel may result in a DBus call to the daemon which then may launch by DBus activation. Prevent that from happening on non-Plasma systems.
+
+BUG: 435420
+CCBUG: 430691
+---
+ src/kglobalaccel.cpp | 80 ++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 80 insertions(+)
+
+--- ./src/kglobalaccel.cpp.orig	2022-01-01 06:30:27.000000000 -0600
++++ ./src/kglobalaccel.cpp	2022-01-15 23:01:56.683914925 -0600
+@@ -30,6 +30,11 @@
+ #endif
+ #endif
+ 
++bool active()
++{
++    return qgetenv("XDG_CURRENT_DESKTOP") == QByteArrayLiteral("KDE");
++}
++
+ org::kde::kglobalaccel::Component *KGlobalAccelPrivate::getComponent(const QString &componentUnique, bool remember = false)
+ {
+     // Check if we already have this component
+@@ -150,6 +155,11 @@
+ void KGlobalAccel::activateGlobalShortcutContext(const QString &contextUnique, const QString &contextFriendly, const QString &programName)
+ {
+     Q_UNUSED(contextFriendly);
++
++    if (!active()) {
++        return;
++    }
++
+     // TODO: provide contextFriendly
+     self()->d->iface()->activateGlobalShortcutContext(programName, contextUnique);
+ }
+@@ -157,6 +167,10 @@
+ // static
+ bool KGlobalAccel::cleanComponent(const QString &componentUnique)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique);
+     if (!component) {
+         return false;
+@@ -168,6 +182,10 @@
+ // static
+ bool KGlobalAccel::isComponentActive(const QString &componentUnique)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique);
+     if (!component) {
+         return false;
+@@ -185,6 +203,10 @@
+ 
+ org::kde::kglobalaccel::Component *KGlobalAccel::getComponent(const QString &componentUnique)
+ {
++    if (!active()) {
++        return nullptr;
++    }
++
+     return d->getComponent(componentUnique);
+ }
+ 
+@@ -528,6 +550,10 @@
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ QList<QStringList> KGlobalAccel::allMainComponents()
+ {
++    if (!active()) {
++        return {};
++    }
++
+     return d->iface()->allMainComponents();
+ }
+ #endif
+@@ -535,6 +561,9 @@
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actionId)
+ {
++    if (!active()) {
++        return {};
++    }
+     return d->iface()->allActionsForComponent(actionId);
+ }
+ #endif
+@@ -543,6 +572,10 @@
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ QStringList KGlobalAccel::findActionNameSystemwide(const QKeySequence &seq)
+ {
++    if (!active()) {
++        return {};
++    }
++
+     return self()->d->iface()->actionList(seq);
+ }
+ #endif
+@@ -550,6 +583,10 @@
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(5, 90)
+ QList<KGlobalShortcutInfo> KGlobalAccel::getGlobalShortcutsByKey(const QKeySequence &seq)
+ {
++    if (!active()) {
++        return {};
++    }
++
+     return globalShortcutsByKey(seq);
+ }
+ #endif
+@@ -561,6 +598,10 @@
+ 
+ bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QString &comp)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     return self()->d->iface()->globalShortcutAvailable(seq, comp);
+ }
+ 
+@@ -568,6 +609,10 @@
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringList &actionIdentifier, const QKeySequence &seq)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     if (actionIdentifier.size() < 4) {
+         return false;
+     }
+@@ -590,6 +635,10 @@
+ // static
+ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList<KGlobalShortcutInfo> &shortcuts, const QKeySequence &seq)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     if (shortcuts.isEmpty()) {
+         // Usage error. Just say no
+         return false;
+@@ -622,6 +671,10 @@
+ // static
+ void KGlobalAccel::stealShortcutSystemwide(const QKeySequence &seq)
+ {
++    if (!active()) {
++        return;
++    }
++
+     // get the shortcut, remove seq, and set the new shortcut
+     const QStringList actionId = self()->d->iface()->actionList(seq);
+     if (actionId.size() < 4) { // not a global shortcut
+@@ -659,6 +712,10 @@
+ 
+ bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     if (checkGarbageKeycode(shortcut)) {
+         return false;
+     }
+@@ -674,6 +731,10 @@
+ 
+ bool KGlobalAccel::setShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     if (checkGarbageKeycode(shortcut)) {
+         return false;
+     }
+@@ -699,6 +760,9 @@
+ 
+ QList<QKeySequence> KGlobalAccel::globalShortcut(const QString &componentName, const QString &actionId) const
+ {
++    if (!active()) {
++        return {};
++    }
+     // see also d->updateGlobalShortcut(action, KGlobalAccelPrivate::ActiveShortcut, KGlobalAccel::Autoloading);
+ 
+     // how componentName and actionId map to QAction, e.g:
+@@ -711,11 +775,19 @@
+ 
+ void KGlobalAccel::removeAllShortcuts(QAction *action)
+ {
++    if (!active()) {
++        return;
++    }
++
+     d->remove(action, KGlobalAccelPrivate::UnRegister);
+ }
+ 
+ bool KGlobalAccel::hasShortcut(const QAction *action) const
+ {
++    if (!active()) {
++        return false;
++    }
++
+     return d->actionShortcuts.contains(action) || d->actionDefaultShortcuts.contains(action);
+ }
+ 
+@@ -728,6 +800,10 @@
+ 
+ bool KGlobalAccel::setGlobalShortcut(QAction *action, const QList<QKeySequence> &shortcut)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     KGlobalAccel *g = KGlobalAccel::self();
+     return g->d->setShortcutWithDefault(action, shortcut, Autoloading);
+ }
+@@ -739,6 +815,10 @@
+ 
+ bool KGlobalAccelPrivate::setShortcutWithDefault(QAction *action, const QList<QKeySequence> &shortcut, KGlobalAccel::GlobalShortcutLoading loadFlag)
+ {
++    if (!active()) {
++        return false;
++    }
++
+     if (checkGarbageKeycode(shortcut)) {
+         return false;
+     }
diff --git a/source/kde/kde/post-install/sddm.post-install b/source/kde/kde/post-install/sddm.post-install
index b69fdcd7..3d3c2c76 100644
--- a/source/kde/kde/post-install/sddm.post-install
+++ b/source/kde/kde/post-install/sddm.post-install
@@ -46,7 +46,7 @@ cat <<"EOT" > $PKG/usr/bin/sddm
 if [ -f /etc/default/sddm ]; then
   . /etc/default/sddm
 fi
-/usr/bin/sddm.bin "$*"
+exec /usr/bin/sddm.bin "$@"
 EOT
 chmod 0755 $PKG/usr/bin/sddm
 
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 53ec177a..47d15fb3 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xterm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -111,12 +111,15 @@ make install DESTDIR=$PKG || exit 1
 mkdir -p $PKG/usr/share/applications
 cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
 
-# Install a default XTerm app-defaults that looks like the Linux console.
-# Thanks to GazL.
-cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
-echo >> $PKG/etc/X11/app-defaults/XTerm
-cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm
-touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm
+# Commented out. For now we will use upstream defaults.
+## Install a default XTerm app-defaults that looks like the Linux console.
+## Thanks to GazL.
+#cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
+#echo >> $PKG/etc/X11/app-defaults/XTerm
+#cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm
+#touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm
+
+# Install app-defaults as .new:
 mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new
 
 # Strip binaries: