Do not focus dock windows that raise themselves, bug 234511

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

4 files changed, 84 insertions, 3 deletions

diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index 00d9c7130c0e..1159706ff05b 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfwm4
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.118 2007/12/17 18:37:16 jer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.119 2008/09/21 22:14:06 angelos Exp $
+
+*xfwm4-4.4.2-r1 (21 Sep 2008)
+
+  21 Sep 2008; Christoph Mende <angelos@gentoo.org>
+  +files/xfwm4-4.4.2-dock-window-fix.patch, +xfwm4-4.4.2-r1.ebuild:
+  Do not focus dock windows that raise themselves, bug 234511
 
   17 Dec 2007; Jeroen Roovers <jer@gentoo.org> xfwm4-4.4.2.ebuild:
   Stable for HPPA (bug #201747).
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 2b9805b1fb01..5736f413189e 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xfwm4-4.4.2-dock-window-fix.patch 605 RMD160 4fbc903094af6170bbf321859e45b13622172579 SHA1 977dc584b309ff9a7b023d5fa6e7ac248dbae61b SHA256 c7a907471f91099cb588a46cddd25cda8a5d75ea684df0eabc7822802a3f526d
 DIST xfwm4-4.4.2.tar.bz2 1548533 RMD160 b3ced6edac44b0b232be4312ca2281095c03e14b SHA1 a6d8b3b1493ff98141cfb7232ef6b4940224bce9 SHA256 710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
+EBUILD xfwm4-4.4.2-r1.ebuild 1347 RMD160 a79ac2463ec184a47d548cdadfcfdd4c612c9adb SHA1 d5eaf6b3dd664aa3223c7ba00e8e48dc5e8cfaef SHA256 2f48484cd554883079e2936a2f81d04756a3699af3fc88ebfc973d536a671f31
 EBUILD xfwm4-4.4.2.ebuild 1232 RMD160 7be930002d1325957df7a9fa92e7ccc83ba0242c SHA1 7306d3bb17bb4a15a70e8f98b1f59e9c01652885 SHA256 c4b3caa7bc485836de6187761ff00b1206fa64056ad91e464309392eb544106b
-MISC ChangeLog 13408 RMD160 42160399b2c8eae15f34c53ef4a1512a9c02e084 SHA1 71d9e27b83827f269a248c297f8136ca316b4e22 SHA256 096cb49db64bf42e0496dd99d75b2955c869cdd9317b7bd8f94a03186c5684a1
+MISC ChangeLog 13626 RMD160 92d42918a3a8870d76d1a30e61f9194f95a46c2a SHA1 5c23717e16bd2d5e34e2ea0b822c128781ad0353 SHA256 224dfe22903d2b45572d52140b3a1f0c6d8aeb0bee7cffdd1d853ee9f35fe168
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjWxzoACgkQKhnDs22gwa99NgCfWbhgHZmJVlCXnTSlsNWRIJms
+VC4AnjKUUGbDwqkC5hWMEPK/MPW8/YlM
+=Rdif
+-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfwm4/files/xfwm4-4.4.2-dock-window-fix.patch b/xfce-base/xfwm4/files/xfwm4-4.4.2-dock-window-fix.patch
new file mode 100644
index 000000000000..2f7d408764e9
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.4.2-dock-window-fix.patch
@@ -0,0 +1,13 @@
+Index: trunk/src/events.c
+===================================================================
+--- trunk/src/events.c	(revision 26059)
++++ trunk/src/events.c	(revision 26060)
+@@ -1430,7 +1430,7 @@
+            stealing prevention is not activated, otherwise we just set the "demands attention"
+            flag...
+          */
+-        if ((ev->value_mask & CWStackMode) && (wc.stack_mode == Above) && (wc.sibling == None))
++        if ((ev->value_mask & CWStackMode) && (wc.stack_mode == Above) && (wc.sibling == None) && !(c->type & WINDOW_TYPE_DONT_FOCUS))
+         {
+             Client *last_raised;
+ 
diff --git a/xfce-base/xfwm4/xfwm4-4.4.2-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..86848280f116
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.4.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.2-r1.ebuild,v 1.1 2008/09/21 22:14:07 angelos Exp $
+
+inherit eutils xfce44
+
+XFCE_VERSION=4.4.2
+xfce44
+
+DESCRIPTION="Window manager"
+HOMEPAGE="http://www.xfce.org/projects/xfwm4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug startup-notification xcomposite"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXpm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	xcomposite? ( x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes )
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	x11-libs/pango
+	startup-notification? ( x11-libs/startup-notification )
+	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+XFCE_CONFIG="${XFCE_CONFIG} --enable-xsync --enable-render --enable-randr \
+	$(use_enable xcomposite compositor)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-dock-window-fix.patch
+}
+
+DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
+
+xfce44_core_package