6 files changed, 50 insertions, 25 deletions
diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild
index eafa1faba..26fad21d2 100755
--- a/source/a/dialog/dialog.SlackBuild
+++ b/source/a/dialog/dialog.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018, 2019, 2020, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -87,6 +87,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
@@ -119,7 +121,7 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 # Build and install:
-make -j4 || exit 1
+make $NUMJOBS || exit 1
 make install DESTDIR=$PKG || exit 1
 
 # Keep the old traditional looknfeel :-)
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index c81f30401..a88ebcdd0 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Sun Mar 10 17:49:27 UTC 2024
+  mkbindmounts: also bind mount /sys/firmware/efi/efivars if it exists.
+  SeTconfig: also bind mount /sys/firmware/efi/efivars if it exists.
++--------------------------+
 Thu Feb  1 19:36:54 UTC 2024
   Don't add elilo boot support to the 32-bit installer image. This had been
   done previously, but began being siliently dropped when the 32-bit kernel
diff --git a/source/installer/sources/initrd/sbin/mkbindmounts b/source/installer/sources/initrd/sbin/mkbindmounts
index e5c95c0f1..897889847 100755
--- a/source/installer/sources/initrd/sbin/mkbindmounts
+++ b/source/installer/sources/initrd/sbin/mkbindmounts
@@ -8,3 +8,7 @@ mkdir -p /mnt/{dev,proc,sys}
 mount -o rbind /dev /mnt/dev
 mount -o rbind /proc /mnt/proc
 mount -o rbind /sys /mnt/sys
+# Needed for EFI boot menu operations:
+if [ -d /sys/firmware/efi/efivars ]; then
+  mount -o rbind /sys/firmware/efi/efivars /mnt/sys/firmware/efi/efivars
+fi
diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTconfig b/source/installer/sources/initrd/usr/lib/setup/SeTconfig
index 6731019bb..b51e991dc 100755
--- a/source/installer/sources/initrd/usr/lib/setup/SeTconfig
+++ b/source/installer/sources/initrd/usr/lib/setup/SeTconfig
@@ -43,6 +43,10 @@ if [ ! "$T_PX" = "/" ]; then
   mount --bind /proc $T_PX/proc 1> /dev/null 2> /dev/null
   mount --bind /sys $T_PX/sys 1> /dev/null 2> /dev/null
   mount --bind /dev $T_PX/dev 1> /dev/null 2> /dev/null
+  # Needed for EFI boot menu operations:
+  if [ -d /sys/firmware/efi/efivars ]; then
+    mount --bind /sys/firmware/efi/efivars $T_PX/sys/firmware/efi/efivars 1> /dev/null 2> /dev/null
+  fi
 fi
 # These will be left connected rather than unmounting them to
 # make it easier to set up LVM/LUKS.
diff --git a/source/l/libpaper/libpaper.url b/source/l/libpaper/libpaper.url
index f03c89dd3..87084d62d 100644
--- a/source/l/libpaper/libpaper.url
+++ b/source/l/libpaper/libpaper.url
@@ -1,2 +1,2 @@
 https://github.com/rrthomas/libpaper
-https://github.com/rrthomas/libpaper/releases/download/v2.1.3/libpaper-2.1.3.tar.gz
+https://github.com/rrthomas/libpaper/releases/download/v2.2.3/libpaper-2.2.3.tar.gz
diff --git a/source/xap/xaos/xaos.SlackBuild b/source/xap/xaos/xaos.SlackBuild
index 5eeeb29d2..0bd1f27a8 100755
--- a/source/xap/xaos/xaos.SlackBuild
+++ b/source/xap/xaos/xaos.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2010 B. Watson (yalhcru@gmail.com)
-# Copyright 2010, 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2015, 2018, 2020, 2024  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xaos
-SRCNAM=XaoS-release
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+SRCNAM=XaoS
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | cut -f 2 -d -)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -51,37 +51,48 @@ NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
-OUTPUT=${OUTPUT:-$TMP}
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
-cd $SRCNAM-$VERSION || exit 1
+rm -rf $SRCNAM-$VERSION*
+tar xvf $CWD/$SRCNAM-$VERSION*.tar.?z || exit 1
+cd $SRCNAM-$VERSION* || exit 1
 
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
-qmake-qt5
-make $NUMJOBS || exit 1
-
-mkdir -p $PKG/usr/bin
-cp -a bin/xaos $PKG/usr/bin/xaos
-chown root:root $PKG/usr/bin/xaos
-chmod 755 $PKG/usr/bin/xaos
-
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
+  cmake \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    -DDOC_INSTALL_DIR="doc" \
+    -DMAN_INSTALL_DIR=/usr/man \
+    .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
+
+# Stuff gets installed in the wrong place (and isn't currently configurable)
+# but the binary knows where it's supposed to be so we'll just move it:
 mkdir -p $PKG/usr/share/XaoS
-cp -a catalogs tutorial $PKG/usr/share/XaoS
+mv $PKG/usr/{catalogs,examples,tutorial} $PKG/usr/share/XaoS
+if [ ! -r $PKG/usr/share/XaoS/examples/README ]; then
+  cp -a examples/README $PKG/usr/share/XaoS/examples
+fi
 
-mkdir -p $PKG/usr/share/XaoS/examples
-cp -a examples/README $(find examples -name "*.xpf") $(find examples -name "*.xaf") $PKG/usr/share/XaoS/examples
+# Let's link to the old name too:
+ln -sf XaoS $PKG/usr/bin/xaos
 
 mkdir -p $PKG/usr/share/pixmaps
 cp -a xdg/xaos.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/share/applications
-cp -a xdg/xaos.desktop $PKG/usr/share/applications
+cp -a xdg/io.github.xaos_project.XaoS.desktop $PKG/usr/share/applications/xaos.desktop
 
 # Replace bogus manpage:
 mkdir -p $PKG/usr/man/man6
@@ -99,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz