Implement NET_WM_MOVERESIZE_CANCEL message wrt bug #442218. Patch is from upstream.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 160 insertions, 10 deletions

diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index fe9f4dc6671e..315d0031c03c 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.203 2012/11/28 12:29:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.204 2012/12/31 14:44:22 ssuominen Exp $
+
+*xfwm4-4.10.0-r1 (31 Dec 2012)
+
+  31 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +xfwm4-4.10.0-r1.ebuild,
+  +files/xfwm4-4.10.0-gtk34.patch:
+  Implement NET_WM_MOVERESIZE_CANCEL message wrt bug #442218. Patch is from
+  upstream.
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> xfwm4-4.10.0.ebuild:
   EAPI5
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 81e0e9fc354f..e301c22a2645 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xfwm4-4.10.0.tar.bz2 1100067 SHA256 492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c
+AUX xfwm4-4.10.0-gtk34.patch 2680 SHA256 7534ed9a4f407209f5e553e80ee7268edad7ac5b6af20786109780ff8a173a3d SHA512 4a63cc1ca799b0e5e034f8d4bee3988bb1b54fb79b7f2e7de0f524074c19fc325d639ef8c8fadef3735470575961441dab4fd93dd219d06514413683307c658b WHIRLPOOL 09a21a32a11688a495a5b9d6a4a9bf01b929c0a1e047acc045ad543f295dd210ce2cf0b707599ed112e1e625622001330c303cd61789c76f4f731c7857482c47
+DIST xfwm4-4.10.0.tar.bz2 1100067 SHA256 492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c SHA512 5581168a902c247131ab6997571e08fabb2de66f26e033fb6cb90533c7c4065c44980d86a48851d7252b6d38132ed57107028eee66274900d4ee147297e9446d WHIRLPOOL 9e49e58ab08055b25b1cf03a8c16428dde58447332364064b892a2855743d7c695bf97a0be950fc61dce02b26850ad951262aab0be562fc7ebff316dc55e98b0
+EBUILD xfwm4-4.10.0-r1.ebuild 1480 SHA256 cd11cacd2b25c7de593a5cf4dd9568dfd641e082a2abbc6acad4af3c60163c64 SHA512 183e64276c86a94d39cfbf0fd44bb0a9813f3bb2eca94b566b4b701aaa48d43c0b3f9f0e50cea63c9373de09f3620d40132193ede9119124e6593fb1c33b3f04 WHIRLPOOL 5893d473326b5300adc054ef33d0522dcde4ef087302b80e7ce94735c22d3f1fb32c56b44892d7bc8eea5f99b9aebb80558e146896193c2995aaa0326d09a972
 EBUILD xfwm4-4.10.0.ebuild 1424 SHA256 27527837eae82efe3f261777ae398a00c5f88667d089fbb11fccb83789cccc3e SHA512 66fc967c406acde749a7fffaaba8c2d2f9db9fe4a402c6c3cd4ed47a2adcfdf823abe266708623208c0c31a8de99d359ab0a3b20815b9ef6720bf12ca4016e37 WHIRLPOOL aec015e7996eb18a2d00475602c6a641c72ffb3b5576d9d01e2d41614d0a06eb577aa6104917f5d13b8e4b3fd88f02aff84312c0932c8f424270b75f30b9cec1
-MISC ChangeLog 22260 SHA256 041a37859f2ad61f52ef425a33a4bb8f84afad611cf64aa5b4d5ff0ce9c77178 SHA512 001b9f8fb3f240fdba66b8568d172a120ec21ea7a8b934edafefb3feb570228a6a57c8cb4f8d579e8ec6a1e1009aebc4e9c6c4f03141939dbb24233c1ccf138e WHIRLPOOL 45b91489f36ecd0498bfe60c2ee146e6bfb9ce428b2c7df3373c9f4ab48e63e8e55ce8ea1a62058eb31173fb2593065f0c795d0b6327a2dd3ec40794f719e42a
+MISC ChangeLog 22495 SHA256 31b29d9080cd050c48ba6df571b56a282890538d54c7b7f135f0a12d7dc33b75 SHA512 02cb5e3a52631565dd2cd33ae4c2a610d974ae13a6928b3b30f2d5395ff5521c3c0852de4fb5501dfebec86570cb5b824860fe96d72d5f2f49ea742d30f111a8 WHIRLPOOL 378cf4f3ca7ae47855455f0d416414ac392ce6e55d2ed65b6c6a77a9e6d4912a4766af2ae13c7691843a8ada6b7db1b26136cfe4a6e47d75563a91f7f2987785
 MISC metadata.xml 157 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 SHA512 54ff64307677bfe1e9b62d427e8aef8aaf32b86216858541398b5f21974247418eba7612f801ff2c333fe9a059d60e1f568046a3ac88e0ee2d59beb3a3a77148 WHIRLPOOL a42edf92b91b9922e7af397d6cbad72ba7e2ab7e5aaa4504cdd8bebdc1d87e9523e76c016eab474f4b65581a9cd58a3be13d8f52bf5ae7dc6afe96d428433a5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQtgNnAAoJEEdUh39IaPFNtTsH/i/VNCex1IUOkJ9VNMM2nSEh
-/KgF9pRfbfusPXKbitCP2zKw05MvKD0GZgFVMOvvcd2cvSt5rLVhVM38yukZHGae
-2zjt7GRul2N/YM+Z+Y5q6lDALHH6ralYtxy+k1fwCJdUY19N4gNiubzheATco/La
-UftVe/1P/To+ws/SETJsW+XspHBMefH6DdrW7tmU4g3l7EAyW1gFOJxeyElVPLHr
-M92lOOcbz/oTHupfGCUiNIC0aIT/FEnE+f3YlIYFeyvr1GD2aJA81Lx1O0TZmC+K
-ZeLu/tPh//RvPld3YwTT/AErQ3Wo3uzgKAwtxQEq22P4iIrjtWyLNxcKLy7nh3o=
-=GvKk
+iQEcBAEBCAAGBQJQ4aSAAAoJEEdUh39IaPFNewgH/3VYUp5rYF/okt7vUlxsF0zU
+VUDfnaykFAN/OY9rhMlEHm8fP1PcngHnGsqZzAucuk8duMZhtgWvDkQBcqYh2Atx
+pMJrZFq5uJzfq6vjYtLQA28E5oVirN1LQ43aukERwl/pH2xJrZrqOv2meWP+JzNf
+dtAm3oXDc/ygULtzcd9D2OGaqxYPyIukqZXSqbmVn/1lULz+axNBPDfAbIMZ4SFP
+tmDPa3U0RtJEZxqyUPQffPPuSFs5zGMcYxrxypwHyzCBSKC7bvZaYkROwllJstU8
+8ViscGUoAe9bqZgKcmYyjA2cG/3PoyYc8M/Ct4LIIDfiQpCToR5JOsJOZjy2Iqk=
+=wz2O
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfwm4/files/xfwm4-4.10.0-gtk34.patch b/xfce-base/xfwm4/files/xfwm4-4.10.0-gtk34.patch
new file mode 100644
index 000000000000..c9352fdee77c
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.10.0-gtk34.patch
@@ -0,0 +1,86 @@
+http://bugs.gentoo.org/442218
+
+From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan@xfce.org>
+Date: Wed, 18 Jul 2012 20:12:07 +0000
+Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
+
+as gtk+-3.4 now uses it.
+---
+diff --git a/src/display.h b/src/display.h
+index 1ad2ef8..8797237 100644
+--- a/src/display.h
++++ b/src/display.h
+@@ -163,7 +163,8 @@ enum
+     NET_WM_MOVERESIZE_SIZE_LEFT,
+     NET_WM_MOVERESIZE_MOVE,
+     NET_WM_MOVERESIZE_SIZE_KEYBOARD,
+-    NET_WM_MOVERESIZE_MOVE_KEYBOARD
++    NET_WM_MOVERESIZE_MOVE_KEYBOARD,
++    NET_WM_MOVERESIZE_CANCEL
+ };
+ 
+ enum
+diff --git a/src/moveresize.c b/src/moveresize.c
+index 9893c30..a98bdf7 100644
+--- a/src/moveresize.c
++++ b/src/moveresize.c
+@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+     eventFilterStatus status = EVENT_FILTER_STOP;
+     MoveResizeData *passdata = (MoveResizeData *) data;
+     Client *c = NULL;
+-    gboolean moving = TRUE;
++    gboolean moving;
+     XWindowChanges wc;
+     int prev_x, prev_y;
+ 
+@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+     display_info = screen_info->display_info;
+     configure_flags = NO_CFG_FLAG;
+ 
++    /*
++     * Clients may choose to end the move operation,
++     * we use XFWM_FLAG_MOVING_RESIZING for that.
++     */
++    moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++
+     /* Update the display time */
+     myDisplayUpdateCurrentTime (display_info, xevent);
+ 
+@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+     screen_info = c->screen_info;
+     display_info = screen_info->display_info;
+     status = EVENT_FILTER_STOP;
+-    resizing = TRUE;
++
++    /*
++     * Clients may choose to end the resize operation,
++     * we use XFWM_FLAG_MOVING_RESIZING for that.
++     */
++    resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
+ 
+     frame_x = frameX (c);
+     frame_y = frameY (c);
+diff --git a/src/netwm.c b/src/netwm.c
+index 545e64a..1352f08 100644
+--- a/src/netwm.c
++++ b/src/netwm.c
+@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
+             resize = TRUE; /* Resize */
+             break;
+         case NET_WM_MOVERESIZE_MOVE:
+-        default:
+             event->type = ButtonPress;
+             resize = FALSE; /* Move */
+             break;
++        case NET_WM_MOVERESIZE_CANCEL:
++            FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++            /* Walk through */
++        default: /* Do nothing */
++            return;
++            break;
+     }
+ 
+     if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+--
+cgit v0.9.0.3
diff --git a/xfce-base/xfwm4/xfwm4-4.10.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..fe7c88d948f1
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.10.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.10.0-r1.ebuild,v 1.1 2012/12/31 14:44:22 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug startup-notification +xcomposite"
+
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	>=x11-libs/libwnck-2.30:1
+	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/xfconf-4.10
+	startup-notification? ( x11-libs/startup-notification )
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-gtk34.patch )
+
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xcomposite compositor)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+}