[neon/extras/qcoro/Neon/unstable] debian: switch away from dbus-x11 (#1117104)

[Pino Toscano]

Git commit 7a2ee5152f0688e99ecec1953c71c1e05343d903 by Pino Toscano.
Committed on 21/12/2025 at 11:27.
Pushed by carlosdem into branch 'Neon/unstable'.

switch away from dbus-x11 (#1117104)

- backport upstream commit de4b2568ef9391db98d678ffab9f3e6313ddb1d3
- B-D change: dbus-x11 -> dbus-daemon

M  +6    -0    debian/changelog
M  +1    -1    debian/control
A  +1    -0    debian/patches/series
A  +37   -0    debian/patches/upstream_Use-dbus-run-session-to-run-D-Bus-tests-instead-of-d.patch

https://invent.kde.org/neon/extras/qcoro/-/commit/7a2ee5152f0688e99ecec1953c71c1e05343d903

diff --git a/debian/changelog b/debian/changelog
index 77e7fe5..61ebd1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 qcoro (0.12.0-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Switch away from dbus-x11: (Closes: #1117104)
+    - backport upstream commit de4b2568ef9391db98d678ffab9f3e6313ddb1d3 to use
+      dbus-run-session in the test suite rather than dbus-launch; patch
+      upstream_Use-dbus-run-session-to-run-D-Bus-tests-instead-of-d.patch
+    - switch the dbus-x11 test build dependency to dbus-daemon
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 21 Dec 2025 12:21:18 +0100
 
diff --git a/debian/control b/debian/control
index 6aaa108..f26341d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Sandro Knauß <hefee at debian.org>
 Build-Depends: dpkg-dev (>= 1.22.5), cmake (>= 3.18.4~),
-               dbus-x11 <!nocheck>,
+               dbus-daemon <!nocheck>,
                debhelper-compat (= 13),
                libqt5websockets5-dev (>= 5.15.0~),
                qt6-websockets-dev (>= 6.2.0~),
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2b03986
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Use-dbus-run-session-to-run-D-Bus-tests-instead-of-d.patch
diff --git a/debian/patches/upstream_Use-dbus-run-session-to-run-D-Bus-tests-instead-of-d.patch b/debian/patches/upstream_Use-dbus-run-session-to-run-D-Bus-tests-instead-of-d.patch
new file mode 100644
index 0000000..6a0a495
--- /dev/null
+++ b/debian/patches/upstream_Use-dbus-run-session-to-run-D-Bus-tests-instead-of-d.patch
@@ -0,0 +1,37 @@
+From de4b2568ef9391db98d678ffab9f3e6313ddb1d3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Sun, 23 Nov 2025 10:45:27 +0100
+Subject: [PATCH] Use dbus-run-session to run D-Bus tests instead of
+ dbus-launch
+
+dbus-run-session spawns a session that gets terminated automatically
+after the execution of the command. It is a simpler way compared to
+dbus-launch, which relies on the X11 tolaunching (which would explain
+why it is not used on macOS, as the comment says).
+
+Hence, use dbus-run-session instead of dbus-launch to run each D-Bus
+test. Keep the existing macOS behaviour as-is for now, adding a comment
+to test using dbus-run-session in the future.
+---
+ tests/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 676993c..debe1f9 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -64,9 +64,10 @@ function(qcoro_add_dbus_test _name)
+     target_compile_definitions(test-${_name} PRIVATE TESTDBUSSERVER_EXECUTABLE=\"$<TARGET_FILE:testdbusserver>\")
+     if (APPLE)
+         # On MacOS dbus-launch doesn't work, so we rely on the session dbus running
++        # TODO: check whether dbus-run-session works
+         add_test(NAME test-${_name} COMMAND test-${_name})
+     else()
+-        add_test(NAME test-${_name} COMMAND dbus-launch $<TARGET_FILE:test-${_name}>)
++        add_test(NAME test-${_name} COMMAND dbus-run-session $<TARGET_FILE:test-${_name}>)
+     endif()
+     _enable_supressions(${_name})
+ endfunction()
+-- 
+2.51.0
+