9 files changed, 62 insertions, 76 deletions
diff --git a/source/a/elogind/11-prefer-deep-suspend.patch b/source/a/elogind/11-prefer-deep-suspend.patch
deleted file mode 100644
index c3d3d23b5..000000000
--- a/source/a/elogind/11-prefer-deep-suspend.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./src/sleep/10-elogind.conf.orig	2024-04-16 02:21:44.000000000 -0500
-+++ ./src/sleep/10-elogind.conf	2024-04-16 13:32:01.046025234 -0500
-@@ -19,4 +19,4 @@
- #HandleNvidiaSleep=no
- #HibernateByUsing=
- #SuspendByUsing=
--#SuspendMode=s2idle deep
-+SuspendMode=deep s2idle
diff --git a/source/a/elogind/doinst.sh b/source/a/elogind/doinst.sh
index e39e2aee3..e529fda15 100644
--- a/source/a/elogind/doinst.sh
+++ b/source/a/elogind/doinst.sh
@@ -29,7 +29,6 @@ preserve_perms() {
 preserve_perms etc/rc.d/rc.elogind.new
 config etc/elogind/logind.conf.new
 config etc/elogind/sleep.conf.new
-config etc/elogind/sleep.conf.d/10-elogind.conf.new
 config etc/pam.d/elogind-user.new
 
 # Reload elogind-daemon:
diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index 1cf9c09ee..ead080f8e 100755
--- a/source/a/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elogind
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -98,33 +98,30 @@ find . \
 # but sed will still happily scribble all over everything.
 cat $CWD/elogind.nobody.nogroup.99.99.diff | patch -p1 --verbose || exit 1
 
-# Don't prefer s2idle, as it doesn't seem to work:
-cat $CWD/11-prefer-deep-suspend.patch | patch -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 mkdir meson-build
 cd meson-build
-meson \
-  --buildtype=release \
-  --prefix=/usr \
-  --libdir=/lib${LIBDIRSUFFIX} \
-  --libexecdir=/lib${LIBDIRSUFFIX}/elogind \
-  -Dpkgconfiglibdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \
-  -Dpamlibdir=/lib${LIBDIRSUFFIX}/security \
+meson setup \
+  --buildtype release \
+  --prefix /usr \
+  --libdir /usr/lib${LIBDIRSUFFIX} \
+  -Drootlibdir="/lib${LIBDIRSUFFIX}" \
+  -Drootlibexecdir="/lib${LIBDIRSUFFIX}/elogind" \
   -Dudevrulesdir="/lib/udev/rules.d" \
   -Ddocdir="/usr/doc/$PKGNAM-$VERSION" \
   -Dhtmldir="/usr/doc/$PKGNAM-$VERSION/html" \
   -Dmandir="/usr/man" \
-  -Dman=enabled \
-  -Dhtml=disabled \
+  -Dman=true \
+  -Dhtml=false \
   -Dbashcompletiondir="/usr/share/bash-completion/completions" \
   -Dnobody-user=nobody \
   -Dnobody-group=nogroup \
-  -Dpam=enabled \
+  -Dpam=true \
+  -Dpamlibdir="/lib${LIBDIRSUFFIX}/security" \
   -Dpamconfdir="/etc/pam.d" \
-  -Dacl=enabled \
+  -Dacl=true \
   -Dsmack=false \
   -Dutmp=true \
   -Ddefault-hierarchy=legacy \
@@ -139,15 +136,14 @@ meson \
   DESTDIR=$PKG $NINJA install || exit 1
 cd ..
 
-# Create symlinks for elogind binaries to /bin/:
-mkdir -p $PKG/bin
-ln -sf /usr/bin/elogind-inhibit $PKG/bin/elogind-inhibit
-ln -sf /usr/bin/loginctl $PKG/bin/loginctl
+# Create symlinks for elogind binaries to /usr/bin/:
+mkdir -p $PKG/usr/bin
+ln -sf /bin/elogind-inhibit $PKG/usr/bin/elogind-inhibit
+ln -sf /bin/loginctl $PKG/usr/bin/loginctl
 
 # Make sure we do not overwrite the user's customizations:
 mv -i $PKG/etc/elogind/logind.conf{,.new}
 mv -i $PKG/etc/elogind/sleep.conf{,.new}
-mv -i $PKG/etc/elogind/sleep.conf.d/10-elogind.conf{,.new}
 mv -i $PKG/etc/pam.d/elogind-user{,.new}
 
 # Strip binaries:
diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
index 1a8c6a2a6..959810d9e 100755
--- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
+++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gdk-pixbuf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild
index 1c41e4036..f83b85613 100755
--- a/source/l/polkit/polkit.SlackBuild
+++ b/source/l/polkit/polkit.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=polkit
 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/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
index 25f681522..7fa8d4a56 100755
--- a/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2010, 2011, 2014, 2016  Robby Workman, Northport, Alabama, USA
-# Copyright 2013, 2014, 2015, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2013, 2014, 2015, 2016, 2018, 2020, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=NetworkManager
 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:
 MARCH=$( uname -m )
@@ -98,50 +98,44 @@ for dfile in $CWD/patches/* ; do
   zcat $dfile | patch -p1 --verbose || exit 1
 done
 
-# For git-patched builds
-autoreconf -vif
-automake
-./autogen.sh
-
-# Configuring --enable-json-validation --enable-ovs requires the Jansson
-# json-c library. If there's any interest or usefulness with that, let me
-# know. The library is fairly small, but in order to actually use team
-# interfaces will probably require more stuff (not sure how much).
-#
-# Update September 2018: Added those options since we needed Jansson
-# already for HTTP/2 support.
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --with-udev-dir=/lib/udev \
-  --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \
-  --with-crypto=nss \
-  --enable-more-warnings=no \
-  --without-resolvconf \
-  --with-dhcpcd=/sbin/dhcpcd \
-  --with-dhclient=yes \
-  --with-modem-manager-1=yes \
-  --with-nmtui=yes \
-  --enable-json-validation \
-  --enable-ovs \
-  --with-consolekit=no \
-  --with-session-tracking=elogind \
-  --with-suspend-resume=elogind \
-  --with-hostname-persist=slackware \
-  --build=$TARGET || exit 1
-
-make $NUMJOBS || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+  --buildtype=release \
+  -Dudev_dir=/lib/udev \
+  -Ddbus_conf_dir=/usr/share/dbus-1/system.d \
+  -Dpppd_plugin_dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \
+  -Dcrypto=nss \
+  -Dresolvconf=false \
+  -Ddhcpcd=/sbin/dhcpcd \
+  -Dconfig_dhcp_default=dhcpcd \
+  -Ddhclient=/sbin/dhclient \
+  -Dmodem_manager=true \
+  -Dnmtui=true \
+  -Dovs=true \
+  -Dsession_tracking_consolekit=false \
+  -Dsession_tracking=elogind \
+  -Dsuspend_resume=elogind \
+  -Dhostname_persist=slackware \
+  -Dsystemd_journal=false \
+  -Dsystemdsystemunitdir=no \
+  -Dmore_logging=false \
+  -Dselinux=false \
+  -Dlibaudit=no \
+  -Dqt=false \
+  -Ddocs=true \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -158,6 +152,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \+
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# Relocate:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+mv $PKG/usr/share/doc/NetworkManager/examples $PKG/usr/doc/$PKGNAM-$VERSION
+rm -r $PKG/usr/share/doc
+
 # In case NetworkManager tries to install something here:
 rm -f $PKG/etc/rc.d/rc.networkmanager
 
diff --git a/source/xap/freerdp/freerdp.SlackBuild b/source/xap/freerdp/freerdp.SlackBuild
index 6252d5db3..21e78ee05 100755
--- a/source/xap/freerdp/freerdp.SlackBuild
+++ b/source/xap/freerdp/freerdp.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=freerdp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index ab6c28373..92d0f6e84 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -279,7 +279,7 @@ if [ ! -z $MOZLOCALIZE ]; then
 fi
 
 # They say to use the second line, not the first.
-# But they're not the boos of me.
+# But they're not the boss of me.
 export MACH_USE_SYSTEM_PYTHON="1"
 #export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 export MOZILLA_OFFICIAL="1"
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index b4cfb0cde..58ecad05b 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -250,7 +250,7 @@ if [ ! -z $MOZLOCALIZE ]; then
 fi
 
 # They say to use the second line, not the first.
-# But they're not the boos of me.
+# But they're not the boss of me.
 export MACH_USE_SYSTEM_PYTHON="1"
 #export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 export BUILD_OFFICIAL=1