Fix bug #127980.

(Portage version: 2.0.54)

5 files changed, 62 insertions, 36 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 56d2f95e1055..94e355356aec 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.45 2006/03/28 01:04:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.46 2006/03/31 13:33:00 carlo Exp $
+
+*kwin-3.5.2-r1 (31 Mar 2006)
+
+  31 Mar 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kwin-3.5.2-alt_tab_crash.diff, +kwin-3.5.2-r1.ebuild:
+  Fix bug #127980.
 
   28 Mar 2006; Aron Griffis <agriffis@gentoo.org> kwin-3.5.0.ebuild,
   kwin-3.5.1.ebuild, kwin-3.5.1-r1.ebuild, kwin-3.5.2.ebuild:
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index a1699c894c3e..79b97e1e8784 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,51 +1,20 @@
-MD5 62afb2a557738ddd3e4f13bfd3a1fd7e ChangeLog 5669
-RMD160 2e2267f86df5b771815d1e1f666cb2fd93a94e8a ChangeLog 5669
-SHA256 710a68e661f2d37d149065b791ea5272748e4c1b4b5a5c249ce67cc2d8076cb8 ChangeLog 5669
+MD5 228126e0fcd2d3062498a4a47cd59ecf ChangeLog 5831
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kwin-3.4.1 212
-RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-kwin-3.4.1 212
-SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-kwin-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kwin-3.4.2 287
-RMD160 db88376c4259165535f83f3529f0834fb2209612 files/digest-kwin-3.4.2 287
-SHA256 3f1b77c90587a110ffb3a1402c6f10a87ef93bfdbc1345bb2138188a52c9cb8b files/digest-kwin-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kwin-3.4.3 68
-RMD160 fe4b253b0a7c2e30a2aa1d0d796dfcb11e30590a files/digest-kwin-3.4.3 68
-SHA256 2c163305cf238b4283a2263d089f3a5cdacfe053018c1fa5d8a5879593baf1a8 files/digest-kwin-3.4.3 68
 MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kwin-3.5.0 142
-RMD160 5a25b9d5e731ecbb0238d4016eec7d640fd809ca files/digest-kwin-3.5.0 142
-SHA256 2aa9daeb1aa26a4ddbc37c210bcd1cde8dbaa15d45bfd5f58d45ac26f7d36aea files/digest-kwin-3.5.0 142
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kwin-3.5.1 68
-RMD160 e8de4cf825e2775377e7f125b1429912ad1e826e files/digest-kwin-3.5.1 68
-SHA256 10f133d38f99c77b6ed8c236ac66bdcfb0451b0e213dc5ec626d6adff17382b5 files/digest-kwin-3.5.1 68
 MD5 6d6e32602b3d2fa7a1eae33592cdec5c files/digest-kwin-3.5.1-r1 250
-RMD160 a98ddea8c9ba3e7b2548bd9a71b09755241f79be files/digest-kwin-3.5.1-r1 250
-SHA256 2403848f28e03a9df899b0ef4d01bcb0d231a3647931bdb54ce44b67b249e429 files/digest-kwin-3.5.1-r1 250
 MD5 612323f8728d639ddab8f055f88070ff files/digest-kwin-3.5.2 250
-RMD160 b6e5ff095263b6bdb0f28016a100b78ce0d038ae files/digest-kwin-3.5.2 250
-SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/digest-kwin-3.5.2 250
+MD5 5efe75301bc0d47d1f2af0ce2feb2603 files/digest-kwin-3.5.2-r1 68
 MD5 eda269a8bc07c3484024540b83dba9ff files/kwin-3.5.1-systray.patch 819
-RMD160 2528e57a17fe4eddd9cdf94da308059c799ca0ab files/kwin-3.5.1-systray.patch 819
-SHA256 e2c29c5abfd7f744b290553a341eac5975cb4dd84db1f9a3bb9844a86037b2d4 files/kwin-3.5.1-systray.patch 819
+MD5 1ea48b1904f323b5937b4168048a5561 files/kwin-3.5.2-alt_tab_crash.diff 642
 MD5 2809511699650a8a076be8791e4d1567 kwin-3.4.1.ebuild 384
-RMD160 9a05f5adc449a45161e31c56572035a16fbe3242 kwin-3.4.1.ebuild 384
-SHA256 2df5424cc7c9de3f78cf0970a1ec4a5d7ae9a4b0101c8227d60aa542bc014f3d kwin-3.4.1.ebuild 384
 MD5 83701c6ee016cca9476c28a71b8b6f8d kwin-3.4.2.ebuild 388
-RMD160 7ce7c0b74db6fa7a3c76018c309cd3398da9d9f5 kwin-3.4.2.ebuild 388
-SHA256 aafcc1381c3fe9bf479f3f01ecabd448c97e42cd7dac30009826c0edb44a25a7 kwin-3.4.2.ebuild 388
 MD5 695a5f6ea3a7c5784b476831098018d8 kwin-3.4.3.ebuild 389
-RMD160 7928293c7f4ff1d108deb42785c31ccb4f0b2952 kwin-3.4.3.ebuild 389
-SHA256 ec86ae544ffc1b7330b1fb5de0331fe2a7620df50e9beeb9c4087f805d49c9f3 kwin-3.4.3.ebuild 389
 MD5 02c4e56749e886e6ef9c26dfb846abf1 kwin-3.5.0.ebuild 1004
-RMD160 12d2f7b540ae013afd3621c40cd7e2b16ca2f2b9 kwin-3.5.0.ebuild 1004
-SHA256 e9218cf473474742077c3408dc48b03ef1b3ca74d329133b7181dff752eb097f kwin-3.5.0.ebuild 1004
 MD5 449ed1137ab38898d16c6574841fddc9 kwin-3.5.1-r1.ebuild 787
-RMD160 63001e55cb6c80e551acdc1dec4852cbc88c001e kwin-3.5.1-r1.ebuild 787
-SHA256 738877bd5a331ea481e57c796715c36982f8c164daa4157a74568cfad3bbd3c2 kwin-3.5.1-r1.ebuild 787
 MD5 4f30410c7b676311f85d7808875c893e kwin-3.5.1.ebuild 742
-RMD160 69b434744a52e636cdc135bff6276ba5d4729517 kwin-3.5.1.ebuild 742
-SHA256 2fd8b58110ad81f0db550a0e63034ae53f6a240c76ef595b12c7c15b418e64d4 kwin-3.5.1.ebuild 742
+MD5 ca9c22441a9717a7ee7b0fd9bd746997 kwin-3.5.2-r1.ebuild 795
 MD5 e7c832648aebfa9a1ca1b64aaa664adb kwin-3.5.2.ebuild 742
-RMD160 6ce59a062b96b6c2ca3c7589757ec82f6c2653c6 kwin-3.5.2.ebuild 742
-SHA256 948ef9fbc56fd08d772841b1260982e4bcb635fe02982ddc8ab1c739bbd71716 kwin-3.5.2.ebuild 742
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/kwin/files/digest-kwin-3.5.2-r1 b/kde-base/kwin/files/digest-kwin-3.5.2-r1
new file mode 100644
index 000000000000..9c5d5e23a110
--- /dev/null
+++ b/kde-base/kwin/files/digest-kwin-3.5.2-r1
@@ -0,0 +1 @@
+MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/kwin/files/kwin-3.5.2-alt_tab_crash.diff b/kde-base/kwin/files/kwin-3.5.2-alt_tab_crash.diff
new file mode 100644
index 000000000000..0c39e9fd8f4a
--- /dev/null
+++ b/kde-base/kwin/files/kwin-3.5.2-alt_tab_crash.diff
@@ -0,0 +1,20 @@
+--- kdebase/kwin/tabbox.cpp	2006/02/27 09:54:03	514048
++++ kdebase/kwin/tabbox.cpp	2006/03/31 10:42:59	524823
+@@ -1152,6 +1152,8 @@
+ */
+ Client* Workspace::nextFocusChainClient( Client* c ) const
+     {
++    if ( !c )
++        return 0;
+     int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+     if ( focus_chain[desktop].isEmpty() )
+         return 0;
+@@ -1170,6 +1172,8 @@
+ */
+ Client* Workspace::previousFocusChainClient( Client* c ) const
+     {
++    if ( !c )
++        return 0;
+     int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+     if ( focus_chain[desktop].isEmpty() )
+         return 0;
diff --git a/kde-base/kwin/kwin-3.5.2-r1.ebuild b/kde-base/kwin/kwin-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..3df9b9f0c6ce
--- /dev/null
+++ b/kde-base/kwin/kwin-3.5.2-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.2-r1.ebuild,v 1.1 2006/03/31 13:33:00 carlo 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"
+IUSE="xcomposite"
+RDEPEND="xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+DEPEND="${RDEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+
+PATCHES="${FILESDIR}/kwin-3.5.2-alt_tab_crash.diff"
+
+src_compile() {
+	myconf="$myconf $(use_with xcomposite composite)"
+	kde-meta_src_compile
+}