diff --git a/hardware/bluetooth/bluez/actions.py b/hardware/bluetooth/bluez/actions.py index 4c4cbb25ee..980b71a962 100644 --- a/hardware/bluetooth/bluez/actions.py +++ b/hardware/bluetooth/bluez/actions.py @@ -12,7 +12,8 @@ from pisi.actionsapi import get def setup(): # pisitools.dosed("configure.ac", "rst2man", "rst2man_3") #shelltools.system("sed -i -e '/SystemdService/d' obexd/src/org.bluez.obex.service.in") - pisitools.dosed("obexd/src/org.bluez.obex.service.in", "SystemdService", deleteLine=True) + # pisitools.dosed("obexd/src/org.bluez.obex.service.in", "SystemdService", deleteLine=True) + # pisitools.dosed("obexd/src/dbus-org.bluez.service.in", "SystemdService", deleteLine=True) autotools.autoreconf("-fiv") autotools.configure("--localstatedir=/var \ --enable-sixaxis \ diff --git a/hardware/bluetooth/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch b/hardware/bluetooth/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch new file mode 100644 index 0000000000..505f43b085 --- /dev/null +++ b/hardware/bluetooth/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch @@ -0,0 +1,20 @@ +https://github.com/bluez/bluez/issues/806 +https://bugs.gentoo.org/928417 +--- bluez-5.73.orig/Makefile.obexd 2024-04-02 10:38:48.743419656 +0200 ++++ bluez-5.73/Makefile.obexd 2024-04-02 10:40:53.300086281 +0200 +@@ -1,13 +1,13 @@ + # SPDX-License-Identifier: GPL-2.0 + if OBEX + ++dbussessionbusdir = $(DBUS_SESSIONBUSDIR) ++dbussessionbus_DATA = obexd/src/org.bluez.obex.service ++ + if SYSTEMD + systemduserunitdir = $(SYSTEMD_USERUNITDIR) + systemduserunit_DATA = obexd/src/obex.service + +-dbussessionbusdir = $(DBUS_SESSIONBUSDIR) +-dbussessionbus_DATA = obexd/src/org.bluez.obex.service +- + obexd-add-service-symlink: + $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service \ No newline at end of file diff --git a/hardware/bluetooth/bluez/pspec.xml b/hardware/bluetooth/bluez/pspec.xml index 1b4e554aff..63201eeda6 100644 --- a/hardware/bluetooth/bluez/pspec.xml +++ b/hardware/bluetooth/bluez/pspec.xml @@ -32,6 +32,7 @@ python3-Pygments + 0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch @@ -39,6 +40,7 @@ + bluez Development files for bluez-libs @@ -74,6 +76,7 @@ System.Service + bluez-libs Libraries for use in Bluetooth applications @@ -85,6 +88,7 @@ /usr/share/doc + bluez-libs-devel Development files for bluez-libs @@ -96,7 +100,15 @@ /usr/lib/pkgconfig + + + 2024-07-12 + 5.77 + Rebuild for new conf + Pisi Linux Community + admin@pisilinux.org + 2024-07-12 5.77