summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2022-05-23 17:52:18 +0200
committerFlorian Franzmann2022-05-23 18:01:26 +0200
commit8da1408cef50b833fe20dfed124beeab87bdf91b (patch)
treeb13a498ff2e883b0f921a7da210577b445043046
parentfaa6cfb6b94dc5c510d62eed5b88fa513513339f (diff)
xorg-app/xdm: launch dbus session if available
-rw-r--r--xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch37
-rwxr-xr-xxorg-app/xdm/DEPENDS7
-rw-r--r--xorg-app/xdm/HISTORY4
-rwxr-xr-xxorg-app/xdm/PRE_BUILD6
4 files changed, 52 insertions, 2 deletions
diff --git a/xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch b/xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch
new file mode 100644
index 0000000000..74b2ea74ca
--- /dev/null
+++ b/xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch
@@ -0,0 +1,37 @@
+From db7616d6daa62a2299b09200bd3d0cba97d8db9d Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf@bandrate.org>
+Date: Mon, 23 May 2022 17:28:41 +0200
+Subject: [PATCH] Use dbus-launcher to start xsession
+
+---
+ config/Xsession.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/config/Xsession.in b/config/Xsession.in
+index c1d7d11..3868a91 100644
+--- a/config/Xsession.in
++++ b/config/Xsession.in
+@@ -57,16 +57,17 @@ fi
+
+ startup=$HOME/.xsession
+ resources=$HOME/.Xresources
++dbus_launch=/usr/bin/dbus-launch
+
+ if [ -s "$startup" ]; then
+ if [ -x "$startup" ]; then
+- exec "$startup"
++ exec "$dbus_launch" --exit-with-session "$startup"
+ else
+- exec /bin/sh "$startup"
++ exec "$dbus_launch" --exit-with-session /bin/sh "$startup"
+ fi
+ else
+ if [ -r "$resources" ]; then
+ BINDIR/xrdb -load "$resources"
+ fi
+- exec BINDIR/xsm
++ exec "$dbus_launch" --exit-with-session BINDIR/xsm
+ fi
+--
+2.36.1
+
diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS
index 2f4e26588b..8c4bf03a32 100755
--- a/xorg-app/xdm/DEPENDS
+++ b/xorg-app/xdm/DEPENDS
@@ -50,4 +50,9 @@ suggest_depends xrdb \
suggest_depends gsettings-desktop-schemas \
"" \
"" \
- "for gsettings support"
+ "for gsettings support" &&
+
+suggest_depends dbus \
+ "" \
+ "" \
+ "for dbus support"
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index 6a3becdbe9..1b74b8c9b7 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,7 @@
+2022-05-22 Florian Franzmann <bwlf@bandrate.org>
+ * DEPENDS, PRE_BUILD, 0001-Use-dbus-launcher-to-start-xsession.patch:
+ launch dbus session if dbus is installed
+
2022-05-21 Florian Franzmann <bwlf@bandrate.org>
* 0001-use-X-s-default-authentication-mechanism-instead-of-.patch,
BUILD: disable xdm's authentication with config option instead of
diff --git a/xorg-app/xdm/PRE_BUILD b/xorg-app/xdm/PRE_BUILD
index 0cdb6f2d26..8208dd2ad9 100755
--- a/xorg-app/xdm/PRE_BUILD
+++ b/xorg-app/xdm/PRE_BUILD
@@ -5,4 +5,8 @@ if [[ $XDM_XCONSOLE == "n" ]]; then
patch -p1 < "$SPELL_DIRECTORY/0001-do-not-start-xconsole.patch"
fi &&
-apply_patch_dir patches
+apply_patch_dir patches &&
+
+if is_depends_enabled $SPELL dbus; then
+ patch -p1 < "$SPELL_DIRECTORY"/0001-Use-dbus-launcher-to-start-xsession.patch
+fi