diff options
| author | Florian Franzmann | 2022-05-22 17:33:41 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2022-05-23 18:01:26 +0200 |
| commit | cbc816effb4fd3d8b06034e2ee48e0ee0cdccb04 (patch) | |
| tree | 03d0c2df21602d34344452a8808459ef09aec0ab | |
| parent | bbb55c387e4369afa4806a1f21a395b2837e3eaa (diff) | |
xorg-app/xdm: Add support for Xsession.d
| -rw-r--r-- | xorg-app/xdm/HISTORY | 3 | ||||
| -rwxr-xr-x | xorg-app/xdm/PRE_BUILD | 4 | ||||
| -rw-r--r-- | xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch | 29 |
3 files changed, 35 insertions, 1 deletions
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY index 161a968cbe..db877f71dc 100644 --- a/xorg-app/xdm/HISTORY +++ b/xorg-app/xdm/HISTORY @@ -3,6 +3,9 @@ BUILD: disable xdm's authentication with config option instead of patch * pam.d/xdm: add pam config + * patches/0001-Source-Xsession.d-files.patch, PRE_BUILD: Source files + in /etc/X11/Xsession.d at session start + 2022-04-04 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.13 diff --git a/xorg-app/xdm/PRE_BUILD b/xorg-app/xdm/PRE_BUILD index ebb921b6e1..0cdb6f2d26 100755 --- a/xorg-app/xdm/PRE_BUILD +++ b/xorg-app/xdm/PRE_BUILD @@ -3,4 +3,6 @@ cd "${SOURCE_DIRECTORY}" && if [[ $XDM_XCONSOLE == "n" ]]; then patch -p1 < "$SPELL_DIRECTORY/0001-do-not-start-xconsole.patch" -fi +fi && + +apply_patch_dir patches diff --git a/xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch b/xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch new file mode 100644 index 0000000000..1509aec13e --- /dev/null +++ b/xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch @@ -0,0 +1,29 @@ +From a52db48fbf45620de1b18a937f387528f6abd44b Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <bwlf@bandrate.org> +Date: Sun, 22 May 2022 17:29:35 +0200 +Subject: [PATCH] Source Xsession.d files + +--- + config/Xsession.in | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/config/Xsession.in b/config/Xsession.in +index 42a8b7d..c1d7d11 100644 +--- a/config/Xsession.in ++++ b/config/Xsession.in +@@ -49,6 +49,12 @@ esac + + XCOMM The startup script is not intended to have arguments. + ++if [ -d /etc/X11/Xsession.d ]; then ++ for i in /etc/X11/Xsession.d/*; do ++ . "$i" ++ done ++fi ++ + startup=$HOME/.xsession + resources=$HOME/.Xresources + +-- +2.36.0 + |