Remove obsolete patch. Remove obsolete version, as 3.4.9 is a bugfix release. Add upstream patch for obxprop rename (bug 298660).

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 106 insertions, 21 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 364de50e93a7..36759bbc1fa0 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.181 2009/12/27 02:03:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.182 2009/12/30 16:32:18 yngwin Exp $
+
+*openbox-3.4.9-r1 (30 Dec 2009)
+
+  30 Dec 2009; Ben de Groot <yngwin@gentoo.org> -openbox-3.4.8.ebuild,
+  +openbox-3.4.9-r1.ebuild, +files/obxprop.patch,
+  -files/openbox-gnomesession.patch:
+  Remove obsolete patch. Remove obsolete version, as 3.4.9 is a bugfix
+  release. Add upstream patch for obxprop rename (bug 298660).
 
 *openbox-3.4.9 (27 Dec 2009)
 
diff --git a/x11-wm/openbox/files/obxprop.patch b/x11-wm/openbox/files/obxprop.patch
new file mode 100644
index 000000000000..3171fbf71185
--- /dev/null
+++ b/x11-wm/openbox/files/obxprop.patch
@@ -0,0 +1,84 @@
+From: Dana Jansens <danakj@orodu.net>
+Date: Mon, 21 Dec 2009 14:59:28 +0000 (-0500)
+Subject: Rename obprop to obxprop (Fixes bug #4419)
+X-Git-Url: http://git.icculus.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3;hp=1fb198410e9d3ca660d91d1049249db0f2f47732
+
+Rename obprop to obxprop (Fixes bug #4419)
+
+Avoids collision with openbabel.
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 4b3e0b5..60c2232 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,7 +33,7 @@ bin_PROGRAMS = \
+ 	openbox/openbox \
+ 	tools/gdm-control/gdm-control \
+ 	tools/gnome-panel-control/gnome-panel-control \
+-	tools/obprop/obprop
++	tools/obxprop/obxprop
+
+ dist_secretbin_SCRIPTS = \
+ 	tools/xdg-autostart/xdg-autostart
+@@ -289,16 +289,16 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
+ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+ 	tools/gnome-panel-control/gnome-panel-control.c
+
+-## obprop ##
++## obxprop ##
+
+-tools_obprop_obprop_CPPFLAGS = \
++tools_obxprop_obxprop_CPPFLAGS = \
+ 	$(GLIB_CFLAGS) \
+ 	$(X_CFLAGS)
+-tools_obprop_obprop_LDADD = \
++tools_obxprop_obxprop_LDADD = \
+ 	$(GLIB_LIBS) \
+ 	$(X_LIBS)
+-tools_obprop_obprop_SOURCES = \
+-	tools/obprop/obprop.c
++tools_obxprop_obxprop_SOURCES = \
++	tools/obxprop/obxprop.c
+
+ ## gdm-control ##
+
+diff --git a/data/rc.xml b/data/rc.xml
+index d7a31bd..eaf3df7 100644
+--- a/data/rc.xml
++++ b/data/rc.xml
+@@ -646,10 +646,10 @@
+   # this is an example with comments through out. use these to make your
+   # own rules, but without the comments of course.
+
+-  <application name="the window's _OB_NAME property (see obprop)"
+-              class="the window's _OB_CLASS property (see obprop)"
+-               role="the window's _OB_ROLE property (see obprop)"
+-               type="the window's _NET_WM_WINDOW_TYPE (see obprob)..
++  <application name="the window's _OB_NAME property (see obxprop)"
++              class="the window's _OB_CLASS property (see obxprop)"
++               role="the window's _OB_ROLE property (see obxprop)"
++               type="the window's _NET_WM_WINDOW_TYPE (see obxprob)..
+                       (if unspecified, then it is 'dialog' for child windows)">
+   # the name or the class can be set, or both. this is used to match
+   # windows when they appear. role can optionally be set as well, to
+diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile
+similarity index 100%
+rename from tools/obprop/Makefile
+rename to tools/obxprop/Makefile
+diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c
+similarity index 99%
+rename from tools/obprop/obprop.c
+rename to tools/obxprop/obxprop.c
+index e288d7c..2685154 100644
+--- a/tools/obprop/obprop.c
++++ b/tools/obxprop/obxprop.c
+@@ -12,7 +12,7 @@ gint fail(const gchar *s) {
+     else
+         fprintf
+             (stderr,
+-             "Usage: obprop [OPTIONS]\n\n"
++             "Usage: obxprop [OPTIONS]\n\n"
+              "Options:\n"
+              "    --help              Display this help and exit\n"
+              "    --display DISPLAY   Connect to this X display\n"
diff --git a/x11-wm/openbox/files/openbox-gnomesession.patch b/x11-wm/openbox/files/openbox-gnomesession.patch
deleted file mode 100644
index 42b866fad489..000000000000
--- a/x11-wm/openbox/files/openbox-gnomesession.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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.ebuild b/x11-wm/openbox/openbox-3.4.9-r1.ebuild
index 6d365c8d209d..a85ab5e8bb56 100644
--- a/x11-wm/openbox/openbox-3.4.8.ebuild
+++ b/x11-wm/openbox/openbox-3.4.9-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.ebuild,v 1.1 2009/12/09 01:24:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.9-r1.ebuild,v 1.1 2009/12/30 16:32:18 yngwin Exp $
 
 EAPI="2"
-inherit eutils
+inherit eutils autotools
 
 MY_P=${P/_/-}
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
@@ -33,6 +33,17 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gnome-session-${PV}.patch
+
+	# The obxprop rename is scheduled for inclusion in the next release,
+	# so this upstream patch should be removed then. Fixes bug 298660.
+	mv "${S}"/tools/obprop "${S}"/tools/obxprop
+	mv "${S}"/tools/obxprop/obprop.c "${S}"/tools/obxprop/obxprop.c
+	epatch "${FILESDIR}"/obxprop.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \