Add X11 session file. This should fix 325689. Thanks to Nikolaj Sjujskij <sterkrig@myopera.com?>

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 145 insertions, 2 deletions

diff --git a/lxde-base/lxde-common/ChangeLog b/lxde-base/lxde-common/ChangeLog
index b940494f5bd8..d266e16436f7 100644
--- a/lxde-base/lxde-common/ChangeLog
+++ b/lxde-base/lxde-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxde-common
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.29 2011/10/09 16:41:12 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.30 2012/02/04 10:47:27 hwoarang Exp $
+
+*lxde-common-0.5.5-r2 (04 Feb 2012)
+
+  04 Feb 2012; Markos Chandras <hwoarang@gentoo.org> +files/lxde,
+  +lxde-common-0.5.5-r2.ebuild:
+  Add X11 session file. This should fix 325689. Thanks to Nikolaj Sjujskij
+  <sterkrig@myopera.com?>
 
   09 Oct 2011; Markus Meier <maekke@gentoo.org> lxde-common-0.5.5-r1.ebuild:
   arm stable, bug #385189
diff --git a/lxde-base/lxde-common/files/lxde b/lxde-base/lxde-common/files/lxde
new file mode 100644
index 000000000000..489ce2d1fe32
--- /dev/null
+++ b/lxde-base/lxde-common/files/lxde
@@ -0,0 +1,90 @@
+#!/bin/sh
+# LXDE Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.lxde-errors" "${TMPDIR-/tmp}/lxde-$USER" "/tmp/lxde-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec /usr/bin/startlxde
diff --git a/lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild b/lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild
new file mode 100644
index 000000000000..b066696781fb
--- /dev/null
+++ b/lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild,v 1.1 2012/02/04 10:47:27 hwoarang Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+PDEPEND="lxde-base/lxde-icon-theme"
+
+src_prepare() {
+	#bug 380043
+	epatch "${FILESDIR}"/${P}-logout.patch
+
+	# Rerun autotools
+	einfo "Regenerating autotools files..."
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	# install session file
+	insinto /etc/X11/Sessions/
+	doins ${FILESDIR}/lxde
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	elog "${P} has renamed the configuration file name to"
+	elog "/etc/xdg/lxsession/LXDE/desktop.conf"
+	elog "Keep in mind you have to migrate your custom settings"
+	elog "from /etc/xdg/lxsession/LXDE/config"
+}