Add a patch from upstream to fix holes in the input shapes.

Package-Manager: portage-2.1.2_pre3-r2

5 files changed, 121 insertions, 8 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 0bf504d62ec5..7d5fec4830b9 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.68 2006/10/07 16:48:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.69 2006/10/16 22:28:50 flameeyes Exp $
+
+*kwin-3.5.5-r1 (16 Oct 2006)
+
+  16 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kwin-3.5.5-input-shape.patch, +kwin-3.5.5-r1.ebuild:
+  Add a patch from upstream to fix holes in the input shapes.
 
   07 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> Manifest:
   Regenerate digest (this time hopefully..).
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 4aa96db4bf8f..308e88ae740e 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -13,6 +13,10 @@ AUX kwin-3.5.2-parallel-make.diff 920 RMD160 2a1a02fa56e2b7c79601d38abd08388c54b
 MD5 acbb4de9f0ed620e73cf727388f64315 files/kwin-3.5.2-parallel-make.diff 920
 RMD160 2a1a02fa56e2b7c79601d38abd08388c54b2f3d0 files/kwin-3.5.2-parallel-make.diff 920
 SHA256 5160b4419c302cb01a71dd8a28f804bcd8c1eabad5b345d62765d64cee3f0660 files/kwin-3.5.2-parallel-make.diff 920
+AUX kwin-3.5.5-input-shape.patch 2920 RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 SHA1 3e1d3993ba87c157c6bf2c2db9f07a235e657568 SHA256 29f7c0677f0d799f983122e5ce05689ac326046452b6c9f6f71d2488161ac9db
+MD5 acec9d692344d8f456265c517248496b files/kwin-3.5.5-input-shape.patch 2920
+RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 files/kwin-3.5.5-input-shape.patch 2920
+SHA256 29f7c0677f0d799f983122e5ce05689ac326046452b6c9f6f71d2488161ac9db files/kwin-3.5.5-input-shape.patch 2920
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
 DIST kdebase-3.5.4.tar.bz2 23636847 RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 SHA1 18f2bb3643a40f937bf260d5969d6919aa52abf4 SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420
@@ -29,14 +33,18 @@ EBUILD kwin-3.5.4.ebuild 747 RMD160 4a9cd1986c1a8797e54c61fcd98a8e3994de6c95 SHA
 MD5 a8a552cd30f10d2fbe2a0599e05fe380 kwin-3.5.4.ebuild 747
 RMD160 4a9cd1986c1a8797e54c61fcd98a8e3994de6c95 kwin-3.5.4.ebuild 747
 SHA256 4de8be9c5bc0624d686231ae05dc3c4532122e8d3b158a595d52eef828b81c45 kwin-3.5.4.ebuild 747
+EBUILD kwin-3.5.5-r1.ebuild 796 RMD160 c32faf36bca9ebe2c56932d791fb552211aa3c0b SHA1 25a07c84f1d5d9352fa4ebc3c3a0b02c61c61fb8 SHA256 3c1dd6a9232b0d4c8a5d7f8b5e6619f2108390860186ccdb843f78ec5dbe7c7c
+MD5 48f7e57f6bed0f4907a0b0fc3e6ddbcc kwin-3.5.5-r1.ebuild 796
+RMD160 c32faf36bca9ebe2c56932d791fb552211aa3c0b kwin-3.5.5-r1.ebuild 796
+SHA256 3c1dd6a9232b0d4c8a5d7f8b5e6619f2108390860186ccdb843f78ec5dbe7c7c kwin-3.5.5-r1.ebuild 796
 EBUILD kwin-3.5.5.ebuild 747 RMD160 b03eaa717d4f92ad3765454355be4a564df6bec6 SHA1 9f9012e3b83bf149f1d38dc63a7d6e49288e0d4d SHA256 577b4c7a8ac4c1784b2466e50e5ffc5b0eee714a1e88eee19db3fc11c3352890
 MD5 afd011aa9a525e227a255d7877287356 kwin-3.5.5.ebuild 747
 RMD160 b03eaa717d4f92ad3765454355be4a564df6bec6 kwin-3.5.5.ebuild 747
 SHA256 577b4c7a8ac4c1784b2466e50e5ffc5b0eee714a1e88eee19db3fc11c3352890 kwin-3.5.5.ebuild 747
-MISC ChangeLog 8477 RMD160 7691be02903d279630b98b8286eb3f28bebf5792 SHA1 9c2ed1d713a1117927c45a1903d6b9e57be46904 SHA256 7928e470f265e8b3d577e0e3df3d690a885646e2f1c18588b3ce9973d6e96158
-MD5 d9e6fa36bfa8e3f626e84ab47bfe01d8 ChangeLog 8477
-RMD160 7691be02903d279630b98b8286eb3f28bebf5792 ChangeLog 8477
-SHA256 7928e470f265e8b3d577e0e3df3d690a885646e2f1c18588b3ce9973d6e96158 ChangeLog 8477
+MISC ChangeLog 8685 RMD160 9384d7c8494b2d5406219923b38fd941a63ccc94 SHA1 7b73cf693ed02aa6e30620997228d6da21e54a1b SHA256 0b3883c2d397d5dbf45317f17049245bdbbb68cace36d63d3d6dd1f83a56673f
+MD5 dc29e0d0c7570dffb19b79663cc11d2e ChangeLog 8685
+RMD160 9384d7c8494b2d5406219923b38fd941a63ccc94 ChangeLog 8685
+SHA256 0b3883c2d397d5dbf45317f17049245bdbbb68cace36d63d3d6dd1f83a56673f ChangeLog 8685
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -53,10 +61,13 @@ SHA256 b707b2d4d2479a72a3fdffaeae923b9a5941e9a9b59affa98d0b785c351a0764 files/di
 MD5 c8e1a72fc1c6daa6d6d1e3199dab9dda files/digest-kwin-3.5.5 250
 RMD160 9f576bf2047d3630eea04f1e44b3e5c07c6e7007 files/digest-kwin-3.5.5 250
 SHA256 9cc3c28d08df92a966fea0a4803780aa582eecd497d09fced2e5dc1c4160c76c files/digest-kwin-3.5.5 250
+MD5 c8e1a72fc1c6daa6d6d1e3199dab9dda files/digest-kwin-3.5.5-r1 250
+RMD160 9f576bf2047d3630eea04f1e44b3e5c07c6e7007 files/digest-kwin-3.5.5-r1 250
+SHA256 9cc3c28d08df92a966fea0a4803780aa582eecd497d09fced2e5dc1c4160c76c files/digest-kwin-3.5.5-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJ9puAiZjviIA2XgRAt7jAKC7RBQ9JWAYLmu9z2bf8SYCtl+JkQCgm1E2
-B+0oTMqDIEtR3z75tCwdhvA=
-=+SX3
+iD8DBQFFNAetAiZjviIA2XgRAhovAJ0XUmTF22+xcokbqXOHILMW5JCzRgCgpaH2
+9qHaEl5xVUyLQRKo/rMO1sM=
+=/lkn
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/digest-kwin-3.5.5-r1 b/kde-base/kwin/files/digest-kwin-3.5.5-r1
new file mode 100644
index 000000000000..155559e1a388
--- /dev/null
+++ b/kde-base/kwin/files/digest-kwin-3.5.5-r1
@@ -0,0 +1,3 @@
+MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886
+RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886
+SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886
diff --git a/kde-base/kwin/files/kwin-3.5.5-input-shape.patch b/kde-base/kwin/files/kwin-3.5.5-input-shape.patch
new file mode 100644
index 000000000000..94cd32d24636
--- /dev/null
+++ b/kde-base/kwin/files/kwin-3.5.5-input-shape.patch
@@ -0,0 +1,63 @@
+From l.lunak@kde.org Tue Oct 10 12:25:53 2006
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdebase/kwin
+Message-Id: <1160475953.522428.2616.nullmailer@svn.kde.org>
+Cc: kde-packager@kde.org,
+ 135250-done@bugs.kde.org
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 6070
+X-UID: 85
+
+SVN commit 594159 by lunakl:
+
+Build the input shape on a helper window instead of directly,
+this avoids having a hole in the shape temporarily. This seems
+to break non-click-to-focus mouse policies on some systems
+(works fine here though).
+BUG: 135250
+CCMAIL: kde-packager@kde.org
+
+
+
+ M  +19 -6     client.cpp  
+
+
+--- branches/KDE/3.5/kdebase/kwin/client.cpp #594158:594159
+@@ -477,16 +477,29 @@
+     // calls it or when the decoration is created/destroyed
+ 
+     if( Shape::version() >= 0x11 ) // 1.1, has input shape support
+-        { // there appears to be no way to find out if a window has input
+-          // shape set or not, so always set propagate the input shape
+-          // (it's the same like the bounding shape by default)
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++        { // There appears to be no way to find out if a window has input
++          // shape set or not, so always propagate the input shape
++          // (it's the same like the bounding shape by default).
++          // Also, build the shape using a helper window, not directly
++          // in the frame window, because the sequence set-shape-to-frame,
++          // remove-shape-of-client, add-input-shape-of-client has the problem
++          // that after the second step there's a hole in the input shape
++          // until the real shape of the client is added and that can make
++          // the window lose focus (which is a problem with mouse focus policies)
++        static Window helper_window = None;
++        if( helper_window == None )
++            helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(),
++                0, 0, 1, 1, 0, 0, 0 );
++        XResizeWindow( qt_xdisplay(), helper_window, width(), height());
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0,
+                            frameId(), ShapeBounding, ShapeSet );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeBounding, ShapeSubtract );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeInput, ShapeUnion );
++        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++                           helper_window, ShapeInput, ShapeSet );
+         }
+     }
diff --git a/kde-base/kwin/kwin-3.5.5-r1.ebuild b/kde-base/kwin/kwin-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..fe33eb94ab74
--- /dev/null
+++ b/kde-base/kwin/kwin-3.5.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.5-r1.ebuild,v 1.1 2006/10/16 22:28:50 flameeyes Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="xcomposite"
+RDEPEND="xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <x11-base/xorg-x11-7 )
+		)"
+DEPEND="${RDEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <x11-base/xorg-x11-7 )
+		)"
+
+PATCHES="${FILESDIR}/${P}-input-shape.patch"
+
+src_compile() {
+	myconf="$myconf $(use_with xcomposite composite)"
+	kde-meta_src_compile
+}