From 740a65bdfa9b2773da822de745bce5a04d27f0c0 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Fri, 14 Nov 2025 19:32:05 +0200 Subject: [PATCH] net-wireless/bluez: fix obexd dbus service install patch Closes: https://bugs.gentoo.org/964983 Bug: https://bugs.gentoo.org/698394 Signed-off-by: Alfred Wingate Part-of: https://github.com/gentoo/gentoo/pull/44627 Closes: https://github.com/gentoo/gentoo/pull/44627 Signed-off-by: Sam James --- ...bluez-5.84.ebuild => bluez-5.84-r1.ebuild} | 6 ++-- .../bluez-5.84-revert-distcheck-fix.patch | 36 +++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) rename net-wireless/bluez/{bluez-5.84.ebuild => bluez-5.84-r1.ebuild} (98%) create mode 100644 net-wireless/bluez/files/bluez-5.84-revert-distcheck-fix.patch diff --git a/net-wireless/bluez/bluez-5.84.ebuild b/net-wireless/bluez/bluez-5.84-r1.ebuild similarity index 98% rename from net-wireless/bluez/bluez-5.84.ebuild rename to net-wireless/bluez/bluez-5.84-r1.ebuild index 109e9acb4f0c4..cd9662d825103 100644 --- a/net-wireless/bluez/bluez-5.84.ebuild +++ b/net-wireless/bluez/bluez-5.84-r1.ebuild @@ -69,6 +69,9 @@ PATCHES=( # Fix Bluetooth LE audio (from Fedora) "${FILESDIR}"/${P}-A2DP-config.patch + + # Merged upstream + "${FILESDIR}"/bluez-5.84-revert-distcheck-fix.patch ) pkg_setup() { @@ -103,9 +106,6 @@ pkg_setup() { src_prepare() { default - # https://github.com/bluez/bluez/issues/806 - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch - eautoreconf multilib_copy_sources diff --git a/net-wireless/bluez/files/bluez-5.84-revert-distcheck-fix.patch b/net-wireless/bluez/files/bluez-5.84-revert-distcheck-fix.patch new file mode 100644 index 0000000000000..11b7e4ac50115 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.84-revert-distcheck-fix.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/698394 +https://bugs.gentoo.org/964983 +https://github.com/bluez/bluez/issues/806 +https://github.com/bluez/bluez/commit/ebd6f9fefa269535b76e28ccc3fa64764f4bd98b +https://patchwork.kernel.org/project/bluetooth/patch/20251111155644.11675-4-parona@protonmail.com/ + +From ebd6f9fefa269535b76e28ccc3fa64764f4bd98b Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Tue, 11 Nov 2025 15:58:19 +0000 +Subject: [PATCH] build: obexd: Revert "Fix make distcheck" + +Fixes: https://github.com/bluez/bluez/issues/806 +Reverts: 9cc8b97b8 ("build: obexd: Fix make distcheck") +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -4,9 +4,6 @@ if OBEX + if SYSTEMD + 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 + +@@ -17,6 +14,10 @@ obexd-add-service-symlink: + obexd-remove-service-symlink: + endif + ++dbussessionbusdir = $(DBUS_SESSIONBUSDIR) ++dbussessionbus_DATA = obexd/src/org.bluez.obex.service ++ ++ + obex_plugindir = $(libdir)/obex/plugins + + obexd_builtin_modules =