Apply fix against gtk-3.4. Bug #424747. Thanks to Francisco Vazquez <fjvazquezaraujo@gmail.com>

(Portage version: 2.1.11.10/cvs/Linux x86_64)

3 files changed, 101 insertions, 1 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 43d6bc14e508..cafe8af775be 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.248 2012/08/14 22:07:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.249 2012/08/17 21:38:57 hwoarang Exp $
+
+*openbox-3.5.0_p20111019-r1 (17 Aug 2012)
+
+  17 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/openbox-3.5.0-gtk34.patch, +openbox-3.5.0_p20111019-r1.ebuild:
+  Apply fix against gtk-3.4. Bug #424747. Thanks to Francisco Vazquez
+  <fjvazquezaraujo@gmail.com>
 
   14 Aug 2012; Johannes Huber <johu@gentoo.org> openbox-3.5.0_p20111019.ebuild:
   Stable for x86, wrt bug #430494
diff --git a/x11-wm/openbox/files/openbox-3.5.0-gtk34.patch b/x11-wm/openbox/files/openbox-3.5.0-gtk34.patch
new file mode 100644
index 000000000000..99394db3e535
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.5.0-gtk34.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/show_bug.cgi?id=424747
+https://bugzilla.icculus.org/show_bug.cgi?id=5460
+
+From: Mikael Magnusson <mikachu@gmail.com>
+Date: Sun, 3 Jun 2012 18:18:48 +0000 (+0200)
+Subject: Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
+X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=339c19d1b3a7a5139aed8b59bad755ddd0e518ff;hp=9a20250243dd57525d83d6e9bba069c932dbe542
+
+Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
+
+gtk+ 3.4 apparently sends these randomly when you select text in a
+GtkEntry. This also fixes bug #5460.
+---
+
+diff --git a/openbox/event.c b/openbox/event.c
+index b9ec1c5..4d091bf 100644
+--- a/openbox/event.c
++++ b/openbox/event.c
+@@ -1495,7 +1495,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
+             }
+             else if ((Atom)e->xclient.data.l[2] ==
+                      OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL))
+-                moveresize_end(TRUE);
++                if (moveresize_client)
++                    moveresize_end(TRUE);
+         } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) {
+             gint ograv, x, y, w, h;
+ 
diff --git a/x11-wm/openbox/openbox-3.5.0_p20111019-r1.ebuild b/x11-wm/openbox/openbox-3.5.0_p20111019-r1.ebuild
new file mode 100644
index 000000000000..6cebbcabd6e4
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.5.0_p20111019-r1.ebuild
@@ -0,0 +1,65 @@
+# 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_p20111019-r1.ebuild,v 1.1 2012/08/17 21:38:57 hwoarang Exp $
+
+EAPI="2"
+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"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="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*/}-gtk34.patch
+	sed -i -e "s:-O0 -ggdb ::" "${S}"/m4/openbox.m4 || die
+	epatch_user
+	eautopoint
+	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 || die "emake install failed"
+	! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
+	! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart
+}