summaryrefslogtreecommitdiffstats
path: root/system/lxdm/patches
diff options
context:
space:
mode:
Diffstat (limited to 'system/lxdm/patches')
-rw-r--r--system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff14
-rw-r--r--system/lxdm/patches/lxdm-0.3.0-without_pam.diff14
-rw-r--r--system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff14
-rw-r--r--system/lxdm/patches/remove_suse_from_Xsession.diff10
4 files changed, 26 insertions, 26 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
deleted file mode 100644
index 4648db02e3..0000000000
--- a/system/lxdm/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-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
index e9a8c5ae97..dacd16d770 100644
--- a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff
+++ b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff
@@ -1,18 +1,18 @@
-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 @@
+diff -Naur lxdm-0.4.0.orig/src/lxdm.c lxdm-0.4.0/src/lxdm.c
+--- lxdm-0.4.0.orig/src/lxdm.c 2011-07-13 14:00:34.000000000 +0200
++++ lxdm-0.4.0/src/lxdm.c 2011-07-22 17:27:34.000000000 +0200
+@@ -153,6 +153,7 @@
while( waitpid(-1, 0, WNOHANG) > 0 ) ;
}
+/* Sorry, -ENOPAM here
+ #if HAVE_LIBPAM
static void close_pam_session(pam_handle_t *pamh)
{
- int err;
-@@ -159,6 +160,7 @@
- pam_end(pamh, err);
+@@ -164,6 +165,7 @@
pamh = NULL;
}
+ #endif
+*/
static LXSession *lxsession_find_greeter(void)
diff --git a/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff
new file mode 100644
index 0000000000..6563354a68
--- /dev/null
+++ b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff
@@ -0,0 +1,14 @@
+diff -Naur lxdm-20120419_2ce143c.orig/src/lxdm.c lxdm-20120419_2ce143c/src/lxdm.c
+--- lxdm-20120419_2ce143c.orig/src/lxdm.c 2012-04-19 16:31:16.000000000 +0200
++++ lxdm-20120419_2ce143c/src/lxdm.c 2012-04-28 18:17:25.186023147 +0200
+@@ -1490,6 +1490,10 @@
+ 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);
+ }
+ else
+ {
diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff
index df1da70b83..475c5c75a9 100644
--- a/system/lxdm/patches/remove_suse_from_Xsession.diff
+++ b/system/lxdm/patches/remove_suse_from_Xsession.diff
@@ -1,10 +1,10 @@
-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 @@
+diff -Naur lxdm-0.4.0.orig/data/Xsession lxdm-0.4.0/data/Xsession
+--- lxdm-0.4.0.orig/data/Xsession 2011-03-17 16:35:47.000000000 +0100
++++ lxdm-0.4.0/data/Xsession 2011-07-22 17:23:49.000000000 +0200
+@@ -27,10 +27,6 @@
elif [ -x /etc/X11/Xsession ]; then
# mandriva, debian, ubuntu
- exec /etc/X11/Xsession $LXSESSION
+ exec /etc/X11/Xsession "$LXSESSION"
-elif [ -x /etc/X11/xinit/xinitrc ]; then
-#suse
- export WINDOWMANAGER=$LXSESSION