[bamf] 04/05: debian/patches: Add 2002_stop-checking-for-dbus-launch-in-configure.patch. Use dbus-run-session in favour of dbus-launch. (Closes: 836081).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository bamf.

commit e88b8b0701a9951183d745cdbd1ee53758da5c97
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 13 12:02:07 2016 +0200

    debian/patches: Add 2002_stop-checking-for-dbus-launch-in-configure.patch. Use dbus-run-session in favour of dbus-launch. (Closes: 836081).
---
 ...e-dbus-run-session-instead-of-dbus-launch.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/2002_use-dbus-run-session-instead-of-dbus-launch.patch b/debian/patches/2002_use-dbus-run-session-instead-of-dbus-launch.patch
new file mode 100644
index 0000000..a83ce1c
--- /dev/null
+++ b/debian/patches/2002_use-dbus-run-session-instead-of-dbus-launch.patch
@@ -0,0 +1,37 @@
+Description: Stop using dbus-launch during unit tests (use dbus-run-session instead).
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,10 +132,10 @@
+ 
+ if test "x$enable_headless_tests" = "xyes"; then
+   AC_PATH_PROG([XVFB],[Xvfb])
+-  AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
++  AC_PATH_PROG([DBUS_RUN_SESSION],[dbus-run-session])
+ 
+-  if test -z "$XVFB" -o -z "$DBUS_LAUNCH"; then
+-    AC_MSG_ERROR([Xvfb and dbus-launch are needed for headless-tests])
++  if test -z "$XVFB" -o -z "$DBUS_RUN_SESSION"; then
++    AC_MSG_ERROR([Xvfb and dbus-run-session are needed for headless-tests])
+   fi
+ fi
+ 
+--- a/tests/Makefile.am.gtests
++++ b/tests/Makefile.am.gtests
+@@ -21,14 +21,7 @@
+ 	export XDG_CURRENT_DESKTOP="Unity"; \
+ 	source $(XVFB_RUN); \
+ 	\
+-	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+-	source $(LOG_PATH)/sessionbus.sh; \
+-	\
+-	make $(AM_MAKEFLAGS) -k test;
+-	\
+-	source $(LOG_PATH)/sessionbus.sh; \
+-	rm $(LOG_PATH)/sessionbus.sh; \
+-	kill $$DBUS_SESSION_BUS_PID;
++	$(DBUS_RUN_SESSION) -- make $(AM_MAKEFLAGS) -k test;
+ 
+ check-local: test-headless
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ff6ddaf..1cacdcb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001_allow-colon-separated-values-in-XDG-CURRENT-DESKTOP.patch
 2001_build-using-mate-common.patch
+2002_use-dbus-run-session-instead-of-dbus-launch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/bamf.git