Bug#1079611: cjs: Please don't build-depend on dbus-x11
Source: cjs
Version: 6.2.0-1
Severity: normal
Tags: patch
User: dbus@packages.debian.org
Usertags: dbus-launch dbus-launch-for-tests
cjs relies on dbus-launch (dbus-x11) to run its test suite, but it
doesn't need to: dbus-run-session (dbus-daemon) is sufficient. Please
consider the attached patch, similar to one that I sent for gjs.
See also <https://lists.debian.org/debian-devel/2016/08/msg00554.html>,
a mass bug filing in 2016.
The autopkgtests still pass with the attached patch (tested in qemu,
lxc, podman).
I didn't try cjs 6.0 (in testing/unstable) but I suspect that the same
patch would be equally valid there.
Thanks,
smcv
>From 9c592ca6b8ba802be4a9d2cc8772a6baf19d3b95 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 25 Aug 2024 10:57:02 +0100
Subject: [PATCH] Run tests using dbus-run-session instead of dbus-x11
This avoids pulling in backwards-compatibility code in
/etc/X11/Xsession.d.
Closes: #-1
---
debian/control | 1 -
debian/rules | 1 +
debian/tests/control | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 44bbbc09..745b59b8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Uploaders:
Build-Depends:
at-spi2-core <!nocheck>,
dbus-daemon <!nocheck>,
- dbus-x11 <!nocheck>,
debhelper-compat (= 13),
dh-sequence-gir,
dh-sequence-gnome,
diff --git a/debian/rules b/debian/rules
index 32e22fd1..f6ad3b01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,7 @@ override_dh_auto_test:
obj-$(DEB_HOST_GNU_TYPE)/cjs-console -c 'print("Smoke-test OK")'
env \
TZ=UTC \
+ dbus-run-session -- \
xvfb-run -a \
dh_auto_test -- -v -C $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) --timeout-multiplier 4
diff --git a/debian/tests/control b/debian/tests/control
index f341a109..640f6ddf 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -7,5 +7,5 @@ Depends: libcjs-dev, build-essential
Restrictions: superficial
Tests: installed-tests
-Depends: dbus-daemon, dbus-x11, cjs-tests, gnome-desktop-testing, xauth, xvfb
+Depends: dbus-daemon, cjs-tests, gnome-desktop-testing, xauth, xvfb
--
2.45.2
Reply to: