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

Package-Manager: portage-2.1.11.10/cvs/Linux x86_64

4 files changed, 117 insertions, 9 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/Manifest b/x11-wm/openbox/Manifest
index d40ba7202732..28d1e4b8aee8 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -3,23 +3,31 @@ Hash: SHA256
 
 AUX openbox-3.4.11.2-parallel-install.patch 366 SHA256 63f6e407461e071103009225a98ad0fb5d1b911ad28ea71a79c0b0e89efb5a8c SHA512 c9245dbff2917ce68c76e967b21d1b23e2c074a5923008371bbdaab8ed9e1f4ddea6870b0b6588499242362fcb4bebc32f9922712e37b4fa69feec1c98c8831b WHIRLPOOL e36fd6d4160b1196fa36e16e281c97aadf8f0623030b85aac38a2d60586b9d105270c6dbf173a1b0c975523eaf7ee72b000255216107d175df653ada3f2f6df4
 AUX openbox-3.5.0-configure-imlib2.patch 413 SHA256 a7d2f26033ae2424426c90a265db50d8349cc53d3d80eb6e7d3efa73fc28db36 SHA512 ababb000ae6b57dd2015ded6f2a1b735dc6fad6d874f636a9373dac7ae02d71a41a325e0ed58826d581b39c175c895e61b3cad995ce3cabed12aed737eaf9ccd WHIRLPOOL 571832c4352a42f81321272492e359824917a3212bde932bc760ad562385190ecaf4c5e977ce2a016aa65bb4b3b2f977cf72e3afb959894ed5e133423d6aa8df
+AUX openbox-3.5.0-gtk34.patch 1153 SHA256 c5497245539605a02b465aad228c16e44f4969ad55f67c89711a7565cd508d44 SHA512 bca42e03a656cf876f04f84e2c1a68c549aec6f1523016443c593795ae43ffb3cb96dcd5ae04830c0e04f6528d650335f70b1cf8c5aa167ea5a6fbf76dd2d493 WHIRLPOOL c40219fbff41c8d398e15546d20f095c7cccde30f2bddb8ff48a8c0c577cca0c13d52928db75ee3a548ca6cda55f77694c3aea2fd20c688d1a983e189a3e928d
 AUX openbox-as-needed.patch 413 SHA256 48f38ab155a15320fb4c9a447a58e27fac2b74eb4a5504cd0b7707ae5384703a SHA512 681b86b106674f47ed11cc2a68288b3c5ba78a148bd663d9861b904fa2cfc2f3d2f4bbc2e75e1fb28d7af40409818b1c123ddf1bfb67c4e62064d16506fe0621 WHIRLPOOL 12a2064a5c6a24318a3122ae4a3bcdd3c0c3721f654fb42f4d30ed4c824debfc9b129b2039bd20a253c6c7db72de002597e420ff7f103fd0073362176ff48696
 AUX openbox-gnome-session-3.4.9.patch 449 SHA256 0fbbf60ba8ce2503d307cf55b6467b3cf53e01d32deff1417e3afbf6397d9eb5 SHA512 03b828152ca6c38d2bf9962a254d911179248173642c0ddd3af0023ff93b6d3c479f12d411f7119fb1ca476b1ac03b807c0f83ef159e08ed4caa21269f7f0e87 WHIRLPOOL 172f2c5b031ed68918795feaf4464241cf55ee8064638e45bfebbfe4c684b6400ab609b1b034cc327be0fa8deedf79d17cc477d894c0b3fd5035c47046bf5bc5
 DIST openbox-3.5.0.tar.gz 911834 SHA256 6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a SHA512 208d2641e171eca5fae0a2104a9b3c6d685293b4d66a18c0c2900df267453911b8738ef239fd84656b41440a0568279de67b9af798a6457b7716b1aab14704b5 WHIRLPOOL 5b9d49ec4428b1889b17794fe9807cb81261add2313cbabe8cbb92eed04730d72b8bac89d5e1bba04fda6d8fb477693ac8d3090cecddddbb747188b4f58341c9
 DIST openbox-3.5.0_p20111019.tar.gz 475441 SHA256 de9af320f67e46d6ee2d09cb577e4fde954b35733497d08fd3e6f188accba408 SHA512 d20a5ce0e69c6a6be95b451a254f4d3c03f6c746d1f0365d261962a31ef6ca0aa8f6f6b404deef0ea8f1737d96983c1e04123a561b26e740de854c93ab29666f WHIRLPOOL 2b561957e31154b65e128a3659980d45895ca09508253c0178a70c4305dc42de30413e4ce3cb6b014fdd894a346be04ca77dd74a3fae8b078f7e3e9c85a9cae8
 EBUILD openbox-3.5.0-r1.ebuild 1817 SHA256 d256b1026aec70f890810767721dba9e04897c8bbb38cef14c7e4bd7c4137bd5 SHA512 acbc316fa6c1e650aa0058b6bac4ed611126e8778b9ececc2cec59422544d1c8c28b6c6425799f39ff595bd4072b77223f25d743c55d70f00f6ac22513f749a5 WHIRLPOOL 0fe19b114a009262fd3f3e2a74b5f1cdb7c36dce29f9947a3130de45484f3a13ae9615f9f611ea1c4ac0ce8b52fcd303a10751af3c682c8385f7ae6d935dab07
+EBUILD openbox-3.5.0_p20111019-r1.ebuild 1892 SHA256 11b32c85f1f1d5fdf6d49f5a754125820677c52105b93a4ca0a6e9bf095d0a1b SHA512 155405b52efa06a3846f797fa2d9e78111a4beb48558a05ea0f262ceb0944006c97d145b0ada6272c313e6a03f05d00ce8b7fd67a3428a440d78bfa29e019e65 WHIRLPOOL 2a00ca73f6e9839fbada700814b9680660bfa01b73f93741fa7dabf5d5ad6f2c27d45eaee99ac32141a6862b46906a212e63be0584f5486a2ba28590a6a1d4a1
 EBUILD openbox-3.5.0_p20111019.ebuild 1837 SHA256 f2f2cc2f0fa43144f2067bf034f343aad61162759abbed64b50df02dd4d2b18a SHA512 a2c105cbb3f321a33855493b821be02fc08afea7b5c61dfef906f20e80ab4ae12d3f43baefd970909211cd76a4ea9205067fd1b95807a2a200e25087c7cb33a7 WHIRLPOOL c464bf8dd8fd198622fbb9c096207c8899de7001f7da73d06e8fa2261d5c4ae01dfb575a6d7778720bec92d9779ce4e7799b953d609963014420872e623385ea
 EBUILD openbox-9999.ebuild 1904 SHA256 136b5c4c0788aa8f1b588f2ffa025aab36126b2ee7526bb1cd8ba0daec670b1e SHA512 5f623b98757714faafb2f2993840132b10b4bccfa9d65841abb51564edb287c968771d3f035d3bf17cd876ee6250efc18ccd5ff7aa26d813ec25437dae24051e WHIRLPOOL 12a2efd493e15476fa13e219ac59c2052489bd9e309c5de7a95611c415c5517de8674e70af1cb18ec75a608b09137325f1b699629fcdd35eef464ffea05bbeb0
-MISC ChangeLog 37880 SHA256 40eb4668b443870c170ff228b8581d406dff7087521642eb9ab6dfad68c60fb5 SHA512 45e523c1eb4b812208326d766922948acae760372c56f6c50d862ac234d2c116d479cdf243e03d140f3dbcc787bc8b29ee02bb0455b9cf461817b1d222bbb948 WHIRLPOOL b63d990288be156f1491c73aed9d4db1bccdd6cf08cdf57112c9eb1d999fb202eda14cfdb55c6713dc9ccbdd5e01755b0d083c32f422730f8dd67ee61a972327
+MISC ChangeLog 38153 SHA256 491105aa8d3b338af6cd5a8a8ee072788cae755a5d675fd9ca584096697e8fa8 SHA512 89d6f48caf9eb67b2dedfbf0963a38677560b5c2ae031953ba0149e848d52555c67380bfc3a691a93974711ffdf60738472c6822cb08ff2c87bdfcc20c47cc0c WHIRLPOOL bae629e9a00949d8276e143547940c51a9ed50bdbbb9f4c34f63af51bce49bd1a67dc854f6eecc02b50596bb907643f622c2a67148f186f5ff12b9888e9f9f05
 MISC metadata.xml 700 SHA256 42ce3ab980f8cf6077d16381a147008ddaede31d04cac6847359ac38c69a88c6 SHA512 5051524c6f8067718d456417df39edc6265c3007866bbe524b450c6343aca5029c9a1a1eef22996d383aec6d9c668f034e59b198bf2d5b70960c246cf188ddcc WHIRLPOOL 8206ff8ff85d048e6922e3f23c8d855593f0a16d76ab8070e9b95dece672bb97b834bbf32dd1cc5f042e20f2655d21316e104e5269a774001a94c5613d8b1f78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQKswkAAoJEO+t9ga+3I3aLxEH/05LlOMjEsm508S8ndfBIDnR
-gcX78uqF97TbVmFmSvfVjf3nL2Seaes6BVp4/g3XYNS6617ehvyfQL8PUJE4cQUB
-NHOJAm9XMNN4L/iFCUFkYYy7oq0n4qjioINReUo7iJoMSHcgbMaMzFiZvrfhc5lG
-tg3+y/LdBC3xrRwOyjmnD1MA1C35wZ4BoB3YSDL095cFtfRYNPmv6Chc32KNElQm
-OUALfZwlcPCHkJjhlHh5xz8TPQl77MbwsjFUsHnlqWp0IrXxVcQjSrh69Q/aaV5d
-wna2XMIBcxLSfL0CXuO81h+Kb/GE2aUEmlZxm+pUtFiDMoy1lVWzVSUYpDWPCPM=
-=Ymvf
+iQIcBAEBCAAGBQJQLrn3AAoJEPqDWhW0r/LCcvYP/RK/02nroNDnn6vmC4TWZpUg
+2UAJQRNMEYVwDdH1JTojDQxZXcLxyNLcnQBYgVLDjyDZPLbgxxmE/vCC85iqvHxJ
+LkLFGy6t2rD46uFPDC7gaEQO6cR61Woc2nj/MNVQGW/fOjrygZGxrz9EHmDYcMvY
+B9U0NBkKMV3O4KeKXECKvcXvM33twj2upNoGRcI3ncWsGbt3yk+eBtSpuYIP1MZL
+cj4Ez6EwHo7pN7joBI8j9rYbU05AHCcdTo8pzFkQGzfxQBFAwmaBhlY0+IVqFGHm
+FVY1yyxVVberCwjo+HJkDSHd9PdK4Ka7QAwW+TVZRYcE6prrMFIkZYypchImhnsS
+PR8rlllu3xMY2X+jj2Vv3v9Z41lk002a1A3J3WkenViM6GTBGiV8q9NKmM2MyY5I
+gqxLCq7MiafcCxqdR3ogQGwfZik+U1HzG+x+ah2Dcg7ZAOsGHBvXLyqxKh2/4vxF
+qhyVLdGuKyKQPBxHgwAfPW56G0wRRi96rRcqg9UBdQ9J8x0ZHIZQHpZ4pBKD2Tne
+Ta1XCtUOMZWD7Dwvb7dFyoKXAYxoWsQp4sRw2ia4iHI68dWKjh6rWffdhvtC2+7A
+AS2cq028vz3jtRqMc87j1Erkjj26moycIQzbNQjGSgg37iVnKDjShNrhnp6sNuGP
+35wqpXshCFAbTqLLn7jh
+=D9T9
 -----END PGP SIGNATURE-----
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
+}