diff options
| -rw-r--r-- | lxde-base/lxdm/ChangeLog | 12 | ||||
| -rw-r--r-- | lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch | 32 | ||||
| -rw-r--r-- | lxde-base/lxdm/lxdm-0.3.0-r3.ebuild (renamed from lxde-base/lxdm/lxdm-0.3.0-r2.ebuild) | 4 |
3 files changed, 46 insertions, 2 deletions
diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog index 910d5d9c6f59..c5b0c86afe01 100644 --- a/lxde-base/lxdm/ChangeLog +++ b/lxde-base/lxdm/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for lxde-base/lxdm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.4 2011/02/18 08:01:01 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.5 2011/07/03 10:02:29 lxnay Exp $ + +*lxdm-0.3.0-r3 (03 Jul 2011) + + 03 Jul 2011; Fabio Erculiani <lxnay@gentoo.org> -lxdm-0.3.0-r2.ebuild, + +lxdm-0.3.0-r3.ebuild, + +files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer- + for-xsessions-dir-file.patch: + add patch that fixes loading of Fluxbox, E17, Openbox and perhaps others, see + http://lxnay.wordpress.com/2011/07/03/lxdm-the-wannabe-login-manager for more + details *lxdm-0.3.0-r2 (18 Feb 2011) diff --git a/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch b/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch new file mode 100644 index 000000000000..928fd2b94133 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch @@ -0,0 +1,32 @@ +diff -Nurp lxdm-0.3.0.orig/src/lxdm.c lxdm-0.3.0/src/lxdm.c +--- lxdm-0.3.0.orig/src/lxdm.c 2011-07-03 01:53:26.262780480 +0200 ++++ lxdm-0.3.0/src/lxdm.c 2011-07-03 01:52:11.975780526 +0200 +@@ -1174,7 +1174,27 @@ gboolean lxdm_get_session_info(char *ses + } + else + { +- name=g_strdup(session); ++ GKeyFile *f; ++ char *file_path; ++ gboolean loaded; ++ ++ f = g_key_file_new(); ++ char *desktop_name = g_strconcat(session, ".desktop", NULL); ++ file_path = g_build_filename(XSESSIONS_DIR, desktop_name, NULL); ++ loaded = g_key_file_load_from_file(f, file_path, G_KEY_FILE_NONE, NULL); ++ g_free(file_path); ++ g_free(desktop_name); ++ ++ if ( loaded ) ++ { ++ name = g_key_file_get_locale_string(f, "Desktop Entry", "Name", NULL, NULL); ++ exec = g_key_file_get_string(f, "Desktop Entry", "Exec", NULL); ++ } ++ else ++ { ++ name=g_strdup(session); ++ } ++ g_key_file_free(f); + } + } + if(name && !exec) diff --git a/lxde-base/lxdm/lxdm-0.3.0-r2.ebuild b/lxde-base/lxdm/lxdm-0.3.0-r3.ebuild index aa4e4472089b..ca0516933426 100644 --- a/lxde-base/lxdm/lxdm-0.3.0-r2.ebuild +++ b/lxde-base/lxdm/lxdm-0.3.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.3.0-r2.ebuild,v 1.1 2011/02/18 08:01:01 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.3.0-r3.ebuild,v 1.1 2011/07/03 10:02:29 lxnay Exp $ EAPI="2" @@ -35,6 +35,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-pam_console-disable.patch" use consolekit || epatch "${FILESDIR}/${P}-consolekit-disable.patch" + epatch "${FILESDIR}"/${P}-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch + # this replaces the bootstrap/autogen script in most packages eautoreconf |