diff options
| author | Robby Workman <rw@rlworkman.net> | 2010-10-18 23:05:35 +0100 |
|---|---|---|
| committer | Michiel van Wessem <michiel@slackbuilds.org> | 2010-10-18 23:05:35 +0100 |
| commit | aa8b4727fc2f9b42fb956e8d4bf40ac3845ffa98 (patch) | |
| tree | 68e4586a505cdfa69c438acdfe3fbbd08717222d /system/lxdm/patches | |
| parent | 109932ba36192cd89fc5138c3973eb3ad75c5792 (diff) | |
| download | slackbuilds-aa8b4727fc2f9b42fb956e8d4bf40ac3845ffa98.tar.gz | |
system/lxdm: Updated for version 0.3.0.
Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
Diffstat (limited to 'system/lxdm/patches')
4 files changed, 64 insertions, 0 deletions
diff --git a/system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff b/system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff new file mode 100644 index 0000000000..4648db02e3 --- /dev/null +++ b/system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff @@ -0,0 +1,14 @@ +diff -Nur lxdm-0.3.0.orig//src/lxdm.c lxdm-0.3.0/src/lxdm.c +--- lxdm-0.3.0.orig//src/lxdm.c 2010-09-24 10:43:49.000000000 -0500 ++++ lxdm-0.3.0/src/lxdm.c 2010-10-10 23:13:33.592124056 -0500 +@@ -1359,6 +1359,10 @@ + "is-local",&is_local, + NULL)) + setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); ++ /* I really don't like doing this, but since both kdm and gdm ++ set this in the environment, and our xinitrc scripts depend ++ on it, here we go with a minor patch... */ ++ setenv("DESKTOP_SESSION", session_name, 1); + } + #endif + char** env, *path; diff --git a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff new file mode 100644 index 0000000000..e9a8c5ae97 --- /dev/null +++ b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff @@ -0,0 +1,19 @@ +diff -Nur lxdm-0.3.0.orig//src/lxdm.c lxdm-0.3.0/src/lxdm.c +--- lxdm-0.3.0.orig//src/lxdm.c 2010-09-24 10:43:49.000000000 -0500 ++++ lxdm-0.3.0/src/lxdm.c 2010-10-10 23:01:24.711716765 -0500 +@@ -150,6 +150,7 @@ + while( waitpid(-1, 0, WNOHANG) > 0 ) ; + } + ++/* Sorry, -ENOPAM here + static void close_pam_session(pam_handle_t *pamh) + { + int err; +@@ -159,6 +160,7 @@ + pam_end(pamh, err); + pamh = NULL; + } ++*/ + + static LXSession *lxsession_find_greeter(void) + { diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff new file mode 100644 index 0000000000..df1da70b83 --- /dev/null +++ b/system/lxdm/patches/remove_suse_from_Xsession.diff @@ -0,0 +1,14 @@ +diff -Nur lxdm-0.3.0.orig//data/Xsession lxdm-0.3.0/data/Xsession +--- lxdm-0.3.0.orig//data/Xsession 2010-10-12 20:13:01.316302089 -0500 ++++ lxdm-0.3.0/data/Xsession 2010-10-12 20:12:40.989504750 -0500 +@@ -31,10 +31,6 @@ + elif [ -x /etc/X11/Xsession ]; then + # mandriva, debian, ubuntu + exec /etc/X11/Xsession $LXSESSION +-elif [ -x /etc/X11/xinit/xinitrc ]; then +-#suse +- export WINDOWMANAGER=$LXSESSION +- exec -l $SHELL -c /etc/X11/xinit/xinitrc + else + # unknown, user should custom /etc/lxdm/xinitrc self + if [ -x /etc/lxdm/xinitrc ]; then diff --git a/system/lxdm/patches/source_profile_in_Xsession.diff b/system/lxdm/patches/source_profile_in_Xsession.diff new file mode 100644 index 0000000000..8f19e31284 --- /dev/null +++ b/system/lxdm/patches/source_profile_in_Xsession.diff @@ -0,0 +1,17 @@ +diff -Nur lxdm-0.2.0.orig//data/Xsession lxdm-0.2.0/data/Xsession +--- lxdm-0.2.0.orig//data/Xsession 2010-04-12 11:49:44.000000000 -0500 ++++ lxdm-0.2.0/data/Xsession 2010-06-26 04:55:43.301983179 -0500 +@@ -2,6 +2,13 @@ + + # use bash for "exec -l", howto run login shell by /bin/sh ? + ++# First read /etc/profile and .profile ++test -f /etc/profile && . /etc/profile ++test -f "$HOME/.profile" && . "$HOME/.profile" ++# Second read /etc/xprofile and .xprofile for X specific setup ++test -f /etc/xprofile && . /etc/xprofile ++test -f "$HOME/.xprofile" && . "$HOME/.xprofile" ++ + if [ $# -eq 1 -a -n "$1" ]; then + LXSESSION=$1 + else |