New snapshot with latest upstream fix plus a patch for bug #413997

(Portage version: 2.1.11.24/cvs/Linux x86_64)

4 files changed, 186 insertions, 75 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index f80dbf1be62f..888c100cc9d3 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.253 2012/08/29 10:52:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.254 2012/10/06 17:38:11 hwoarang Exp $
+
+*openbox-3.5.0_p20121006 (06 Oct 2012)
+
+  06 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/openbox-3.5.0_p20121006-javaswing.patch,
+  +openbox-3.5.0_p20121006.ebuild, files/openbox-3.5.0-fix-desktop-files.patch:
+  New snapshot with latest upstream fix plus a patch for bug #413997
 
   29 Aug 2012; Julian Ospald <hasufell@gentoo.org> openbox-3.5.0-r1.ebuild,
   openbox-3.5.0_p20111019.ebuild, openbox-3.5.0_p20111019-r2.ebuild,
diff --git a/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch b/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch
index af37e1040b1d..02528461f352 100644
--- a/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch
+++ b/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch
@@ -1,74 +1,64 @@
-https://bugs.gentoo.org/show_bug.cgi?id=431784

-

-fix desktop files according to fd.o desktop entry specifications

-

-diff --git a/data/gnome-wm-properties/openbox.desktop b/data/gnome-wm-properties/openbox.desktop

-index 67e49e4..266c147 100644

---- a/data/gnome-wm-properties/openbox.desktop

-+++ b/data/gnome-wm-properties/openbox.desktop

-@@ -7,7 +7,7 @@ Exec=openbox

- X-GNOME-WMName=Openbox

- 

- # our config tool

--ConfigExec=obconf

-+X-ConfigExec=obconf

- 

--[Window Manager]

-+[X-Window Manager]

- SessionManaged=true

-diff --git a/data/openbox.desktop b/data/openbox.desktop

-index d49ae22..631778b 100644

---- a/data/openbox.desktop

-+++ b/data/openbox.desktop

-@@ -1,6 +1,5 @@

- [Desktop Entry]

- Type=Application

--Encoding=UTF-8

- Name=Openbox

- Exec=openbox

- Icon=openbox

-diff --git a/data/xsession/openbox-gnome.desktop.in b/data/xsession/openbox-gnome.desktop.in

-index 19ae82e..24931b5 100644

---- a/data/xsession/openbox-gnome.desktop.in

-+++ b/data/xsession/openbox-gnome.desktop.in

-@@ -1,8 +1,7 @@

- [Desktop Entry]

--Encoding=UTF-8

- Name=GNOME/Openbox

- Comment=Use the Openbox window manager inside of the GNOME desktop environment

- Exec=@bindir@/openbox-gnome-session

- TryExec=gnome-session

--Icon=openbox.png

--Type=XSession

-+Icon=openbox

-+Type=Application

-diff --git a/data/xsession/openbox-kde.desktop.in b/data/xsession/openbox-kde.desktop.in

-index ddfc72d..bc78a97 100644

---- a/data/xsession/openbox-kde.desktop.in

-+++ b/data/xsession/openbox-kde.desktop.in

-@@ -1,8 +1,7 @@

- [Desktop Entry]

--Encoding=UTF-8

- Name=KDE/Openbox

- Comment=Use the Openbox window manager inside of the K Desktop Environment

- Exec=@bindir@/openbox-kde-session

- TryExec=startkde

--Icon=openbox.png

--Type=XSession

-+Icon=openbox

-+Type=Application

-diff --git a/data/xsession/openbox.desktop.in b/data/xsession/openbox.desktop.in

-index 0914e5b..21669cf 100644

---- a/data/xsession/openbox.desktop.in

-+++ b/data/xsession/openbox.desktop.in

-@@ -1,8 +1,7 @@

- [Desktop Entry]

--Encoding=UTF-8

- Name=Openbox

- Comment=Log in using the Openbox window manager (without a session manager)

- Exec=@bindir@/openbox-session

- TryExec=@bindir@/openbox-session

--Icon=openbox.png

--Type=XSession

-+Icon=openbox

-+Type=Application

+From: Julian Ospald <julian.ospald@googlemail.com>
+Date: Mon, 1 Oct 2012 02:54:18 +0000 (-0400)
+Subject: Make .desktop files obey specs where possible (Fix bug 5737)
+X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=951183654d439a21d2f777148218c8ed3255f928;hp=9e1b59a42981b608a147f6ca6f95946e9d933297
+
+Make .desktop files obey specs where possible (Fix bug 5737)
+---
+
+diff --git a/data/openbox.desktop b/data/openbox.desktop
+index d49ae22..631778b 100644
+--- a/data/openbox.desktop
++++ b/data/openbox.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Type=Application
+-Encoding=UTF-8
+ Name=Openbox
+ Exec=openbox
+ Icon=openbox
+diff --git a/data/xsession/openbox-gnome.desktop.in b/data/xsession/openbox-gnome.desktop.in
+index 19ae82e..24931b5 100644
+--- a/data/xsession/openbox-gnome.desktop.in
++++ b/data/xsession/openbox-gnome.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=GNOME/Openbox
+ Comment=Use the Openbox window manager inside of the GNOME desktop environment
+ Exec=@bindir@/openbox-gnome-session
+ TryExec=gnome-session
+-Icon=openbox.png
+-Type=XSession
++Icon=openbox
++Type=Application
+diff --git a/data/xsession/openbox-kde.desktop.in b/data/xsession/openbox-kde.desktop.in
+index ddfc72d..bc78a97 100644
+--- a/data/xsession/openbox-kde.desktop.in
++++ b/data/xsession/openbox-kde.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KDE/Openbox
+ Comment=Use the Openbox window manager inside of the K Desktop Environment
+ Exec=@bindir@/openbox-kde-session
+ TryExec=startkde
+-Icon=openbox.png
+-Type=XSession
++Icon=openbox
++Type=Application
+diff --git a/data/xsession/openbox.desktop.in b/data/xsession/openbox.desktop.in
+index 0914e5b..21669cf 100644
+--- a/data/xsession/openbox.desktop.in
++++ b/data/xsession/openbox.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Openbox
+ Comment=Log in using the Openbox window manager (without a session manager)
+ Exec=@bindir@/openbox-session
+ TryExec=@bindir@/openbox-session
+-Icon=openbox.png
+-Type=XSession
++Icon=openbox
++Type=Application
diff --git a/x11-wm/openbox/files/openbox-3.5.0_p20121006-javaswing.patch b/x11-wm/openbox/files/openbox-3.5.0_p20121006-javaswing.patch
new file mode 100644
index 000000000000..a49ab50a6982
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.5.0_p20121006-javaswing.patch
@@ -0,0 +1,36 @@
+From c5468fb6cf6341205c15603eb96130fa26bfaea3 Mon Sep 17 00:00:00 2001

+From: Dana Jansens <danakj@orodu.net>

+Date: Sun, 30 Sep 2012 23:24:45 -0400

+Subject: [PATCH] Get the window's title in the fake-managed case since we

+ apply app rule matching (Fix bug 5277)

+

+---

+ openbox/client.c |   10 ++++++----

+ 1 file changed, 6 insertions(+), 4 deletions(-)

+

+diff --git a/openbox/client.c b/openbox/client.c

+index da1650a..970377d 100644

+--- a/openbox/client.c

++++ b/openbox/client.c

+@@ -1210,12 +1210,14 @@

+        from per-app settings */

+     client_get_session_ids(self);

+ 

+-    /* now we got everything that can affect the decorations */

++    /* get this early so we have it for debugging, also this can be used

++     by app rule matching */

++    client_update_title(self);

++

++    /* now we got everything that can affect the decorations or app rule

++       matching */

+     if (!real)

+         return;

+-

+-    /* get this early so we have it for debugging */

+-    client_update_title(self);

+ 

+     /* save the values of the variables used for app rule matching */

+     client_save_app_rule_values(self);

+-- 

+1.7.10

+

diff --git a/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild b/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild
new file mode 100644
index 000000000000..3401422f840b
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild,v 1.1 2012/10/06 17:38:11 hwoarang Exp $
+
+EAPI="4"
+inherit multilib autotools eutils
+
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz
+branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding debug imlib nls python session startup-notification static-libs"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	python? ( dev-python/pyxdg )
+	>=media-libs/fontconfig-2
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
+	epatch "${FILESDIR}"/${P/_p*/}-fix-desktop-files.patch
+	epatch "${FILESDIR}"/${P}-javaswing.patch
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
+		"${S}"/m4/openbox.m4 || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable startup-notification) \
+		$(use_enable session session-management) \
+		$(use_enable static-libs static) \
+		--with-x
+}
+
+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
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			"/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
+	! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart
+}