Fixing openbox session with >gnome-base/gnome-session-2.22 , bug #275138

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 79 insertions, 2 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 015765ccdb49..064fec6206de 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/openbox
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.178 2009/03/16 13:06:56 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.179 2009/11/06 01:09:42 vostorga Exp $
+
+*openbox-3.4.8_rc1-r1 (06 Nov 2009)
+
+  06 Nov 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +openbox-3.4.8_rc1-r1.ebuild, +files/openbox-gnomesession.patch:
+  Fixing openbox session with >gnome-base/gnome-session-2.22, #275138
 
   16 Mar 2009; Raúl Porcel <armin76@gentoo.org> openbox-3.4.7.2.ebuild,
   openbox-3.4.8_rc1.ebuild:
diff --git a/x11-wm/openbox/files/openbox-gnomesession.patch b/x11-wm/openbox/files/openbox-gnomesession.patch
new file mode 100644
index 000000000000..42b866fad489
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-gnomesession.patch
@@ -0,0 +1,18 @@
+diff -up openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.7.2/data/xsession/openbox-gnome-session.in
+--- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession	2008-12-09 18:06:37.000000000 +0100
++++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in	2008-12-09 19:04:14.000000000 +0100
+@@ -11,5 +11,12 @@ fi
+ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+ 
+ # Run GNOME with Openbox as its window manager
+-export WINDOW_MANAGER="@bindir@/openbox"
+-exec gnome-session --choose-session=openbox-session "$@"
++SESSION=$(gconftool-2 -g /desktop/gnome/session/default_session 2> /dev/null)
++test -z "$SESSION" && SESSION="[openbox]"
++echo "$SESSION" | grep -q openbox || SESSION="${SESSION%]},openbox]"
++
++OPENBOX_SESSION=$(gconftool-2 -g /desktop/gnome/session/openbox_session 2> /dev/null)
++[ "$SESSION" != "$OPENBOX_SESSION" ] && gconftool-2 -t list --list-type=strings -s \
++  /desktop/gnome/session/openbox_session "$SESSION" 2> /dev/null
++
++exec gnome-session --default-session-key /desktop/gnome/session/openbox_session "$@"
diff --git a/x11-wm/openbox/openbox-3.4.8_rc1-r1.ebuild b/x11-wm/openbox/openbox-3.4.8_rc1-r1.ebuild
new file mode 100644
index 000000000000..7bf01fd44213
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.4.8_rc1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.8_rc1-r1.ebuild,v 1.1 2009/11/06 01:09:42 vostorga Exp $
+
+EAPI="2"
+inherit eutils
+
+MY_P=${P/_/-}
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
+HOMEPAGE="http://icculus.org/openbox/"
+SRC_URI="http://icculus.org/openbox/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nls startup-notification xinerama"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	nls? ( sys-devel/gettext )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gnomesession.patch"
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable nls) \
+		$(use_enable startup-notification)
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+}