Fri Mar 8 19:20:11 UTC 202420240308192011

n/bluez-5.73-x86_64-1.txz:  Upgraded.
xap/geeqie-2.3-x86_64-1.txz:  Upgraded.
xfce/libxfce4ui-4.18.6-x86_64-1.txz:  Upgraded.
xfce/xfce4-weather-plugin-0.11.2-x86_64-1.txz:  Upgraded.

3 files changed, 14 insertions, 67 deletions

diff --git a/source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch b/source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch
deleted file mode 100644
index 21c99acc4..000000000
--- a/source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2013-04-29
-Initial Package Version: 5.17
-Upstream Status:         unknown
-Origin:                  Arch Linux (Giovanni Campagna)
-Description:             Allow using obexd without systemd in the user session
-
-Not all sessions run systemd --user (actually, the majority
-doesn't), so the dbus daemon must be able to spawn obexd
-directly, and to do so it needs the full path of the daemon.
----
- Makefile.obexd                      | 4 ++--
- obexd/src/org.bluez.obex.service    | 4 ----
- obexd/src/org.bluez.obex.service.in | 4 ++++
- 3 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 obexd/src/org.bluez.obex.service
- create mode 100644 obexd/src/org.bluez.obex.service.in
-
---- ./Makefile.obexd.orig	2019-09-19 13:51:02.000000000 -0500
-+++ ./Makefile.obexd	2019-09-20 14:10:10.647348607 -0500
-@@ -1,12 +1,12 @@
- if SYSTEMD
- systemduserunitdir = $(SYSTEMD_USERUNITDIR)
- systemduserunit_DATA = obexd/src/obex.service
-+endif
- 
- dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
- 
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- 
- if OBEX
- 
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
-deleted file mode 100644
-index a538088..0000000
---- a/obexd/src/org.bluez.obex.service
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
-new file mode 100644
-index 0000000..9c815f2
---- /dev/null
-+++ b/obexd/src/org.bluez.obex.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/bluetooth/obexd
-+SystemdService=dbus-org.bluez.obex.service
--- 
-1.8.3.1
-
-
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index de035ce03..069f952d6 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2009, 2010, 2011, 2012, 2013, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011, 2012, 2013, 2016, 2018, 2024  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -76,8 +76,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/bluez-5.51-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1
-
 sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools}
 
 autoreconf -vif
@@ -126,15 +124,19 @@ chmod 644 $PKG/lib/modprobe.d/btusb.conf
 mkdir -p $PKG/usr/sbin
 ln -s ../libexec/bluetooth/bluetoothd $PKG/usr/sbin
 
-# Move the dbus config file to the system directory
+# Move the dbus config file to the system directory (we're replacing it anyway, so this is just in case)
 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/
 
-# Fix substitution in /usr/share/dbus-1/services/org.bluez.obex.service:
-if [ -x $PKG/usr/libexec/bluetooth/obexd ]; then
-  sed -i "s|@libexecdir@|/usr/libexec|g" $PKG/usr/share/dbus-1/services/org.bluez.obex.service
-fi
+# Install the non-systemd service file. Not all sessions run systemd --user
+# (actually, the majority don't even on machines using that thing), so the dbus
+# daemon must be able to spawn obexd directly, and to do so it needs the full
+# path of the daemon.
+mkdir -p $PKG/usr/share/dbus-1/services
+cp -a $CWD/config/org.bluez.obex.service $PKG/usr/share/dbus-1/services
+chown root:root $PKG/usr/share/dbus-1/services/org.bluez.obex.service
+chmod 644 $PKG/usr/share/dbus-1/services/org.bluez.obex.service
 
 # Install the configuration files
 mkdir -p $PKG/etc/bluetooth $PKG/etc/default
diff --git a/source/n/bluez/config/org.bluez.obex.service b/source/n/bluez/config/org.bluez.obex.service
new file mode 100644
index 000000000..78eff2d15
--- /dev/null
+++ b/source/n/bluez/config/org.bluez.obex.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=/usr/libexec/bluetooth/obexd
+SystemdService=dbus-org.bluez.obex.service