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

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 49 insertions, 4 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/Manifest b/lxde-base/lxdm/Manifest
index 1c6ed88792a6..c3928a5a4378 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,8 +1,9 @@
 AUX lxdm-0.3.0-consolekit-disable.patch 272 RMD160 2f0a98002f85ca47b529cc9ae530b6907100b85b SHA1 810371ac3319c3ebcc39e420a2b64d00ee27210b SHA256 b23a338405f6d01a9a93e7afaaf95a91cb8e5f36d2b864d955f0dcc452f8680a
 AUX lxdm-0.3.0-pam_console-disable.patch 260 RMD160 fa8fb4bd2d0d57235924bb241688b491988fccb3 SHA1 820ef218b6f379bc63c8f24cd43e58fc75769004 SHA256 0e9dbcf422b8db8e559015fb7d50fa0c73006c2f5550f6832b2ba36e38b3c0e0
+AUX lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch 932 RMD160 752138f9d851080e9a8a31838c6ca95b0a0bf97b SHA1 d4e9525483494ab87a61d852c42e8186d0aeaf7e SHA256 d3ad21a7643b86706d5d7f4ec4cf09dbe9805e3eea95c4c035abbf5049ff0c10
 AUX xinitrc 1549 RMD160 f75ead6179a30f718019cc062c14f06dffc88369 SHA1 bdb6ae9f3bdcbc7c1fc893615fbdd3bbb1190d92 SHA256 59b2f69c3a5eba060b2eaae43fc871d9b014419e3b51c84af95cee10f429880c
 DIST lxdm-0.3.0.tar.gz 271373 RMD160 989868e611df4aafe817eaca399ca54155e3dc16 SHA1 a8bcf9e8dcda4203b846c09ee9d9d8c7e2374746 SHA256 19d167898299937c3b2787a0583f308e99e732fa1647fec60083edf812efa638
 EBUILD lxdm-0.3.0-r1.ebuild 1314 RMD160 2b64fcd1108d941c2beafbb4d447bc3117b3deda SHA1 e533d98abd0ade2df7cf1dcbaacbf2d4caea6832 SHA256 82b63bcb28671761b43ab72869956e93b532c0d8726d3eb1d370f725f1f2877a
-EBUILD lxdm-0.3.0-r2.ebuild 1388 RMD160 21291af328af05afa8d848d9b02b1f2d6c9b990f SHA1 0c489acd1b9537b04cdbdfb89a004b3a67ee1eef SHA256 281f2a1ee68ff53168269f2fc5ef66a53b1d3029655d933dc0085ec43493c627
-MISC ChangeLog 887 RMD160 4f74fa6b43dfc1a8d79157cbc086763ca759120e SHA1 75ef95af255ecf4eb9231f231d1418b221eca14d SHA256 c4cd774002235c7033e81b56cb275f2aecc878b8019657e433c5d9115079646a
+EBUILD lxdm-0.3.0-r3.ebuild 1504 RMD160 d16106d0379a81f4558a2dc0524df83ede24710c SHA1 53176d1965d8480df11382f5cc2c7bf112658f50 SHA256 f12a450fa8009699e271b340033ec4f30b490990cf26040548670b0f9c568657
+MISC ChangeLog 1298 RMD160 7e9e5f7d427ee27ec2cdcfefa473f5debcf7ff0d SHA1 e1c203d21608769f8384a96efee0b5bc5bd32c6d SHA256 84c8575c91f3dc6a946bae13e4626d05447f356fd9bc7efaa2d2f28fae5b0d91
 MISC metadata.xml 257 RMD160 b9bf77e1294844bcfc3ed001455eb557b6ebd2c1 SHA1 42fd58059ba3be1da81093e15d981aec360b837c SHA256 2c93820d6ed24d2c61064a046437c0dd70863df39c5a6dbe0019fd7e88b6f922
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