Use Ubuntu patch to workaround the localization and other profile problems. Bug #388247

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

5 files changed, 111 insertions, 18 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 7193b169362b..e47bcfe0080a 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.17 2011/11/04 20:24:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.18 2011/11/05 01:44:15 hwoarang Exp $
+
+*lightdm-1.0.6-r1 (05 Nov 2011)
+
+  05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> -lightdm-1.0.6.ebuild,
+  +lightdm-1.0.6-r1.ebuild, +files/Xsession,
+  +files/session-wrapper-lightdm.patch:
+  Use Ubuntu patch to workaround the localization and other profile problems.
+  Bug #388247
 
 *lightdm-1.0.6 (04 Nov 2011)
 
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 41508a727876..da27d5e3210b 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9
 AUX lightdm 209 RMD160 376933fdcdbc9a3196a1eb741f152cac7447c7b3 SHA1 4903519bee34d24c89e42de9e6a4199ff8e8396e SHA256 ccbc64732dce394e0d238e4c095bdbcab23b4adfdbcf213a763e26d96476d208
+AUX session-wrapper-lightdm.patch 344 RMD160 1630a3f971b81eb2433feba9e0f70ab923da1cdc SHA1 670c4f2b84e5a56ac8cbbf6a61b0701e3c1f8123 SHA256 59e64e288315268714504c52f32561d23a675347f02e23dc28c3740caabb3a8b
 DIST lightdm-1.0.6.tar.gz 648433 RMD160 798fc0a3277e07e50a7c22b961027972f03d695c SHA1 5e9ab2fd7353cf17f06e11b581fdd3f1c21586a7 SHA256 745f2ffe58f90ffb318527d20520e1e8f04a36dfa2ac9cc00140857ef57284ae
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
-EBUILD lightdm-1.0.6.ebuild 3106 RMD160 cefcaf6a6805f2e0079b922d19de6b133d628120 SHA1 fc67d2f0b4e664f0f76b617f9d6888dff16afcec SHA256 11397e343a2b94ab36966252dbf5c862ccf47c3df55efedc1e2adce4461b1fd8
-MISC ChangeLog 2176 RMD160 f88981662920c2b4e8aa429693b2bbaf8598cda3 SHA1 4d16079fa48544fc677e74aed1fd5a81a67ecea1 SHA256 97b71545f17c9636f8ba35b0cd1dec933f37d93927e71cd3bc9a0effd40f3fa0
+EBUILD lightdm-1.0.6-r1.ebuild 3189 RMD160 eeeef66ce2d730c8f256a76b9425bc8b6cbf1923 SHA1 2b3b2c1b0579810eebd2a8725214be909f07329c SHA256 f39eff8d2ecc80f13979a5c4fa5f58220871046394ea27c40f316913fbafc6e4
+MISC ChangeLog 2463 RMD160 1aa2cc4dfaf3bcb2e411f6c80aaeaa14cd28030f SHA1 9d9796dc3805ca5e8429f679c7aa60b5bcbeb1da SHA256 36c4dc11a90ad14fa33ad119eb8b64ea1670d86b03f7a4110da3e11b66d4548b
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtEnCAAoJEPqDWhW0r/LCfOEP/2+qGEjF+PTZ1868jg+EB46p
-Jzu0+gokmSaA4/Y1KZa0wEjM1gYFWxO9A/qKpYxRa9qMNByYbWsYehHowH1P+SSj
-VoPwbRSBqsQ35fo7RMUzzsUtp+JkZGd4O4XakCVkNIIGGi/6LcHbms6VKD+swfe2
-kliQIFNu4IOJJAq0HqRYbFWJCqaq0pLM1vTN4/9i/XmW4DMPJIRKgABKrmjNEZHC
-epjDSRHtCrBhdu7wey+Cclhlsg8OSgOAAV0Js8QmrgT33wWg1K7GVupCLpJsszz7
-gWVtFVH/O6oyHNW4AjgSKQYnmVdlliG+9cjMQhfbhySayZ9nqaxhDfJfgqf/W62P
-IGZeHQjP818Wih+0VXPJoGk2XvyqP4Jav91yPFpD2LNCmAzV/kEkiMJHa8AK12sp
-h+Pe16mdzbb/ZvTy9q7O/FOop5m2XQaUdm+6a5W4TeyJQZdjX9kI+/WRCYZZ8S08
-vsMqBwOrM19AkObIb/3cxt7x6/XX1CyoFWSUGqoKDQ0jlc9rbLV1kKm7g/PhPrvB
-WMcJhCkct1d01jbfrnzExuP1laPrWuMSozjkZ8dAikAPrAJnnmB4PSRC5JI47oiM
-OkluXVpThzzY+4sMj0zzkga53HbGtQkzdmJFlE9fO547KZMS/K3ioTfoJNlHPpJv
-0QZ8T87s9bw83quWOtcJ
-=WydJ
+iQIcBAEBCgAGBQJOtJT0AAoJEPqDWhW0r/LC4tIP/jpMtUzdKI/ArdVpDr2tBlHm
+0014ehte3sOBvxzgUlF/aRIeU/LFC+sUMjh1kLYkpKEwUphDCP9n3N0U/V/czgLP
+KoJkdLhKq7Ts1VFtlLWKK0fvFKX5XWL8+8QuRgRUbrrNKx+3qjro+iWheg04pLlN
+gHg2ojI6JQU4tzVvvymNjipuyLMca4JNSM3wEhlc9soT/HOko7pH3e8TFsSJU3ee
+UosffpuJcazPoSCfVSgdrsjjTQHtpLM8bQCC6GS2T/gPUYRF+TZLXNs5wGP2abxm
+qrCzd9qgH2Cy8COoaoKHVXoCqFjX1GHlaWnFbUPiiY3VXg2dUK/X3ReEGWrEddYb
+l7orkoyv73DuZ90OZosBUiLEvzTbZNJf+izloB/AHakBOeCMXWZ6hV3QAHISuWrt
+yPDRq/OH0qQryoUHEC9QFFafnGtFuNRDhsFYtDQUQzO06rAQuo0pUUVv0cjuNzm4
+UPDQleIi9bTt6AjdCVxC2k2jkKNyjUDCzgYHOee8eMTJwVloSzYac00QPKGue0aJ
+UfKXajsn8seI9F4MFSPjzQB1WMg9OuZLwfujdtD5/JXFGohbgQVtDfgXUpocJXhf
+7Iej1+0pk2fajsYC5LQFoW74SHnGhGsko/9kB92Bp1ELQLXV+cnPivJy0bLO29ly
+6qTPCQuV6wNE/b9hw3e2
+=L5W1
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
new file mode 100644
index 000000000000..5da041e6d7ec
--- /dev/null
+++ b/x11-misc/lightdm/files/Xsession
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+    if [ -f "$file" ]; then
+        echo "Loading profile from $file";
+        . "$file"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+    if [ -f "$file" ]; then
+        echo "Loading resource: $file"
+        xrdb -nocpp -merge "$file"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+    if [ -f "$file" ]; then
+        echo "Loading keymap: $file"
+        setxkbmap `cat "$file"`
+        XKB_IN_USE=yes
+    fi
+done    
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+        if [ -f "$file" ]; then
+           echo "Loading modmap: $file"
+           xmodmap "$file"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
+fi
+
+# Load Xsession scripts
+xsessionddir="/etc/X11/Xsession.d"
+if [ -d "$xsessionddir" ]; then
+    for i in `ls $xsessionddir`; do
+        script="$xsessionddir/$i"
+        echo "Loading X session script $script"
+        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+            . "$script"
+        fi
+    done
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@
diff --git a/x11-misc/lightdm/files/session-wrapper-lightdm.patch b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
new file mode 100644
index 000000000000..f8ffc702c6e3
--- /dev/null
+++ b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
@@ -0,0 +1,12 @@
+Index: data/lightdm.conf
+===================================================================
+--- data.orig/lightdm.conf
++++ data/lightdm.conf
+@@ -25,6 +25,7 @@
+ #cache-directory=/var/cache/lightdm
+ #xsessions-directory=/usr/share/xsessions
+ #xgreeters-directory=/usr/share/xgreeters
++session-wrapper=/etc/lightdm/Xsession
+ 
+ #
+ # Seat defaults
diff --git a/x11-misc/lightdm/lightdm-1.0.6.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild
index 3addb6ff81e5..de353a227483 100644
--- a/x11-misc/lightdm/lightdm-1.0.6.ebuild
+++ b/x11-misc/lightdm/lightdm-1.0.6-r1.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/x11-misc/lightdm/lightdm-1.0.6.ebuild,v 1.1 2011/11/04 20:24:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild,v 1.1 2011/11/05 01:44:15 hwoarang Exp $
 
 EAPI=4
 inherit autotools eutils pam
@@ -39,7 +39,7 @@ DOCS=( NEWS )
 src_prepare() {
 	sed -i -e "/minimum-uid/s:500:1000:" "${S}"/data/users.conf	|| die
 	sed -i -e "s:gtk+-3.0:gtk+-2.0:" "${S}"/configure.ac || die
-
+	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
 	eautoreconf
 }
 
@@ -77,6 +77,8 @@ src_install() {
 	# Install missing files
 	insinto /etc/${PN}/
 	doins "${S}"/data/{users,keys}.conf
+	doins "${FILESDIR}"/Xsession
+
 	# remove .la files
 	find "${ED}" -name "*.la" -exec rm -rf {} +
 	rm -Rf "${ED}"/etc/init || die