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 <parona@protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44627
Closes: https://github.com/gentoo/gentoo/pull/44627
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alfred Wingate
2025-11-14 19:32:05 +02:00
committed by Sam James
parent c29117f431
commit 740a65bdfa
2 changed files with 39 additions and 3 deletions

View File

@@ -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

View File

@@ -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 <parona@protonmail.com>
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 =