3 files changed, 16 insertions, 9 deletions
diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild
index 4a9f85ac1..1f5a41a88 100755
--- a/source/ap/cups/cups.SlackBuild
+++ b/source/ap/cups/cups.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cups
 VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -146,11 +146,10 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new
 # Clear out the additions:
 rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d
 
-# I'm not sure if overwriting this blindly could have ill effects,
-# but it never hurts to play it safe.  According to the dbus-daemon
-# manpage, only files ending in .conf will be used, so there won't
-# be any unintended doubling up.
-mv $PKG/etc/dbus-1/system.d/cups.conf $PKG/etc/dbus-1/system.d/cups.conf.new
+# Move the dbus config file to the system directory
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
 
 # For full CUPS SMB support, you'll need to install the cups-samba
 # package from the source in this directory.  There's no easy way
diff --git a/source/ap/cups/doinst.sh b/source/ap/cups/doinst.sh
index d0349bca7..80ebbd17e 100644
--- a/source/ap/cups/doinst.sh
+++ b/source/ap/cups/doinst.sh
@@ -12,7 +12,7 @@ config() {
 for file in etc/cups/*.new ; do
   config $file
 done
-config etc/dbus-1/system.d/cups.conf.new
+
 if [ -r etc/pam.d/cups.new ]; then
   config etc/pam.d/cups.new
 fi
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index d8cf68b0b..3e57f8f27 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hplip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -150,7 +150,7 @@ PYTHON=/usr/bin/python3 \
   --disable-foomatic-ppd-install \
   --enable-foomatic-drv-install \
   --enable-network-build=yes \
-  --enable-qt4 \
+  --enable-qt5 \
   --enable-policykit \
   --enable-cups-ppd-install \
   --build=$ARCH-slackware-linux \
@@ -160,6 +160,11 @@ PYTHON=/usr/bin/python3 \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG rulesdir=/lib/udev/rules.d || exit 1
 
+# Move dbus configs to system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
@@ -167,6 +172,9 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 # continue to make use of it:
 mkdir -p $PKG/var/lib/hp/
 
+# HAL is long gone:
+rm -rf $PKG/usr/share/hal
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null