Mon Dec 27 23:06:00 UTC 202120211227230600

The --enable-systemd-logind change to xorg-server that caused resume from
suspend regressions (and others) has been reverted, and in retrospect it was
a bad idea to take it at that point, but it had appeared as if it wouldn't
cause problems in the case where Xorg was running as root. Oh well, lesson
learned. But the build script has been enhanced to make it easy to build
rootless versions of the xorg-server packages. Just do this:
  ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server
Depending on your GPU, this could work for your use case with no problems.
Also, I've gone ahead and taken a couple of shared library version bumps since
the projects (opencv and poppler) have decent track records as far as not
introducing regressions, and if there are any, we've got time to test and fix.
I'm still avoiding some things that aren't as trusted in that regard, and will
likely continue to do so. :-)
ap/cups-filters-1.28.10-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/ark-21.12.0-x86_64-2.txz:  Rebuilt.
  Applied upstream patches:
  [PATCH] Fix extraction "Dolphin Actions" not abiding "Open destination
  folder after extracting" setting.
  [PATCH] Do not highlight file after compression.
  Thanks to ctrlaltca.
kde/calligra-3.2.1-x86_64-15.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/cantor-21.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/digikam-7.4.0-x86_64-2.txz:  Rebuilt.
  Recompiled against opencv-4.5.5.
kde/kfilemetadata-5.89.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/kile-2.9.93-x86_64-15.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/kitinerary-21.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/krita-5.0.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/okular-21.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
l/gegl-0.4.34-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
l/gst-plugins-bad-free-1.18.5-x86_64-3.txz:  Rebuilt.
  Recompiled against opencv-4.5.5.
l/imagemagick-7.1.0_19-x86_64-1.txz:  Upgraded.
l/mlt-7.4.0-x86_64-1.txz:  Upgraded.
l/opencv-4.5.5-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/poppler-21.12.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
n/fetchmail-6.4.26-x86_64-1.txz:  Upgraded.
n/tin-2.6.1-x86_64-1.txz:  Upgraded.
x/ibus-anthy-1.5.14-x86_64-1.txz:  Upgraded.
x/xorg-server-1.20.14-x86_64-2.txz:  Rebuilt.
  Recompiled using these options:
  --enable-suid-wrapper --enable-install-setuid --disable-systemd-logind.
x/xorg-server-xephyr-1.20.14-x86_64-2.txz:  Rebuilt.
x/xorg-server-xnest-1.20.14-x86_64-2.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.14-x86_64-2.txz:  Rebuilt.
xap/geeqie-1.6-x86_64-4.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
xap/gimp-2.10.30-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
xfce/tumbler-4.16.0-x86_64-4.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
extra/rust-for-mozilla/rust-1.54.0-x86_64-3.txz:  Added.
  This is an alternate version of Rust that may be useful for compiling
  software from Mozilla since using the very latest Rust often won't
  compile, or produces an unstable build.

22 files changed, 134 insertions, 27 deletions

diff --git a/source/ap/cups-filters/cups-filters.SlackBuild b/source/ap/cups-filters/cups-filters.SlackBuild
index ffbe020a..9ca96c91 100755
--- a/source/ap/cups-filters/cups-filters.SlackBuild
+++ b/source/ap/cups-filters/cups-filters.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cups-filters
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/kde/kde/build/ark b/source/kde/kde/build/ark
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/ark
+++ b/source/kde/kde/build/ark
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index 8351c193..60d3b2f4 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-14
+15
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/digikam
+++ b/source/kde/kde/build/digikam
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile
index 8351c193..60d3b2f4 100644
--- a/source/kde/kde/build/kile
+++ b/source/kde/kde/build/kile
@@ -1 +1 @@
-14
+15
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/ark.patch b/source/kde/kde/patch/ark.patch
new file mode 100644
index 00000000..77f409c9
--- /dev/null
+++ b/source/kde/kde/patch/ark.patch
@@ -0,0 +1,2 @@
+cat $CWD/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch b/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch
new file mode 100644
index 00000000..3144292e
--- /dev/null
+++ b/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch
@@ -0,0 +1,36 @@
+From 015bdfd1de9135279c7662eb89acc81d1a843202 Mon Sep 17 00:00:00 2001
+From: 2155X 2155X <syenergyyy@gmail.com>
+Date: Tue, 7 Dec 2021 01:12:35 +0200
+Subject: [PATCH] Fix extraction "Dolphin Actions" not abiding "Open
+ destination folder after extracting" setting.
+
+BUG: 319134
+CCBUG: 298248
+
+
+(cherry picked from commit 6b3b77e81a05154204ca89140afbec2021ea431b)
+---
+ app/extractfileitemaction.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/app/extractfileitemaction.cpp b/app/extractfileitemaction.cpp
+index b714cee6..cd6b6f96 100644
+--- a/app/extractfileitemaction.cpp
++++ b/app/extractfileitemaction.cpp
+@@ -14,6 +14,7 @@
+ #include <KLocalizedString>
+ #include <KPluginFactory>
+ 
++#include "settings.h"
+ #include "mimetypes.h"
+ #include "pluginmanager.h"
+ #include "batchextract.h"
+@@ -96,7 +97,7 @@ QAction *ExtractFileItemAction::createAction(const QIcon& icon, const QString& n
+     connect(action, &QAction::triggered, this, [urls,name, option, parent,this]() {
+         auto *batchExtractJob = new BatchExtract(parent);
+         batchExtractJob->setDestinationFolder(QFileInfo(urls.first().toLocalFile()).path());
+-        batchExtractJob->setOpenDestinationAfterExtraction(true);
++        batchExtractJob->setOpenDestinationAfterExtraction(ArkSettings::openDestinationFolderAfterExtraction());
+         if (option == AutoSubfolder) {
+             batchExtractJob->setAutoSubfolder(true);
+         } else if (option == ShowDialog) {
diff --git a/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch b/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch
new file mode 100644
index 00000000..764708e2
--- /dev/null
+++ b/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch
@@ -0,0 +1,43 @@
+From 75c6927883342ec533aea4663b7b5dfcf8d699a6 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sat, 25 Dec 2021 13:00:29 +0100
+Subject: [PATCH] Do not highlight file after compression
+
+Dolphin opens a new tab whenever the file is compressed and
+is not smart enough to highlight it in the currently open view.
+Because people are annoyed by it and the alternatives are complex to implement,
+removing it is the best solution.
+
+BUG: 440663
+
+
+(cherry picked from commit 28f2ef4b22f53200cb8789dbc8fe8ecdba3a377f)
+---
+ app/compressfileitemaction.cpp | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/app/compressfileitemaction.cpp b/app/compressfileitemaction.cpp
+index 45e75a6e..692a7195 100644
+--- a/app/compressfileitemaction.cpp
++++ b/app/compressfileitemaction.cpp
+@@ -16,7 +16,6 @@
+ #include <KPluginFactory>
+ 
+ #include <algorithm>
+-#include <KIO/OpenFileManagerWindowJob>
+ 
+ #include "pluginmanager.h"
+ #include "addtoarchive.h"
+@@ -102,10 +101,8 @@ QAction *CompressFileItemAction::createAction(const QIcon& icon, const QString&
+             }
+         }
+         addToArchiveJob->start();
+-        connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob](){
+-            if (addToArchiveJob->error() == 0) {
+-                KIO::highlightInFileManager({QUrl::fromLocalFile(addToArchiveJob->fileName())});
+-            } else if (!addToArchiveJob->errorString().isEmpty()) {
++        connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob]() {
++            if (addToArchiveJob->error() != 0) {
+                 Q_EMIT error(addToArchiveJob->errorString());
+             }
+         });
diff --git a/source/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild
index 67312343..8f17c84a 100755
--- a/source/l/gegl/gegl.SlackBuild
+++ b/source/l/gegl/gegl.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gegl
 VERSION=${VERSION:-$(echo gegl-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild
index fb546de1..bf886150 100755
--- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild
+++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gst-plugins-bad-free
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/x/ibus-anthy/ibus-anthy.SlackBuild b/source/x/ibus-anthy/ibus-anthy.SlackBuild
index 4654ae46..a414c40e 100755
--- a/source/x/ibus-anthy/ibus-anthy.SlackBuild
+++ b/source/x/ibus-anthy/ibus-anthy.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-anthy
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd..0cfbf088 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index c1a5c2e3..e4458a72 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -1,6 +1,34 @@
 # Build Wayland X Server (currently built as standalone):
 BUILD_XWAYLAND=NO
 
+# Build rootless X packages. This is not the default in Slackware and is
+# unlikely to be any time soon, as --enable-systemd-logind seems to really
+# require systemd and does not function 100% with all graphics chipsets.
+# In particular, resuming from suspend may not work with (at least) Radeon
+# chipsets, and NVIDIA chipsets using proprietary drivers. Also, while
+# rootless X works from "startx", it is unsupported by most login managers
+# which will continue to start X as root.
+#
+# Feel free to try it out, though. To build rootless X packages, start the
+# build like this:
+#
+# ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server
+#
+if [ "$ROOTLESSX" = "YES" ]; then
+  ROOTLESS_OPTIONS="--enable-suid-wrapper --disable-install-setuid --enable-systemd-logind"
+else
+  # Here we are building the traditional setuid root X. Technically we could
+  # dispense with the Xorg.wrap wrapper and just have the actual Xorg binary
+  # in /usr/bin, but we've always had the wrapper anyway and it should not
+  # cause any problems. Besides, it might be possible with this configuration
+  # to remove the setuid permissions from /usr/libexec/Xorg and then add the
+  # user to required groups such as input to run rootless as well, though it
+  # may bring its own security issues since other users who are members of
+  # these groups could monitor the devices. It's not recommended to try to
+  # run X rootless in this way, but we're going to keep the option open for now.
+  ROOTLESS_OPTIONS="--enable-suid-wrapper --enable-install-setuid --disable-systemd-logind"
+fi
+
 # Servers to build:
 if [ "$BUILD_XWAYLAND" = "NO" ]; then
   XWAYLAND_OPTION="--disable-xwayland"
@@ -14,12 +42,7 @@ BUILD_SERVERS="--enable-xorg \
   --enable-glamor \
   --enable-kdrive \
   --enable-xephyr \
-  $XWAYLAND_OPTION \
-  --enable-config-udev \
-  --disable-config-hal \
-  --enable-systemd-logind"
-
-#MESA_VERSION=${MESA_VERSION:-7.5}	# unused in 1.7+
+  $XWAYLAND_OPTION "
 
 # Default font paths to be used by the X server:
 DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
@@ -37,7 +60,6 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --disable-static \
   --with-pic \
-  --enable-suid-wrapper \
   --with-int10=x86emu \
   --with-default-font-path="${DEF_FONTPATH}" \
   --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
@@ -45,14 +67,14 @@ CFLAGS="$SLKCFLAGS" \
   --with-os-vendor="Slackware Linux Project" \
   --with-xkb-path=/etc/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
+  --enable-config-udev \
+  --disable-config-hal \
   $BUILD_SERVERS \
+  $ROOTLESS_OPTIONS \
   --build=$ARCH-slackware-linux
 
-#  --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri
-
 if [ "$ARCH" = "x86_64" ]; then
   # To prevent the error "No rule to make target `-ldl'"
   sed -i -e 's#-ldl##' hw/xfree86/Makefile
   sed -i -e 's#-lm#-lm -ldl#' hw/xfree86/Makefile
 fi
-
diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server
index 1f5faf3c..f395855d 100644
--- a/source/x/x11/makepkg/xorg-server
+++ b/source/x/x11/makepkg/xorg-server
@@ -1,3 +1,7 @@
+# Add _rootless tag to the $BUILD if making rootless X packages:
+if [ "$ROOTLESSX" = "YES" ]; then
+  BUILD="${BUILD}_rootless"
+fi
 
 rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest
 mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/bin
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index 80bf1135..5f3e6d9e 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=geeqie
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Download the geeqie Git head if there's no tarball:
 if ! /bin/ls $CWD/geeqie*tar* 1> /dev/null 2> /dev/null ; then
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index c854d342..85167c90 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gimp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild
index baf8c144..d42407c0 100755
--- a/source/xfce/tumbler/tumbler.SlackBuild
+++ b/source/xfce/tumbler/tumbler.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tumbler
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )