Another crash fix, bug 389991

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

4 files changed, 66 insertions, 17 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 8ac37dd0d9c8..deca53265b92 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.136 2011/11/24 22:33:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.137 2011/11/29 21:49:08 dilfridge Exp $
+
+*plasma-workspace-4.7.3-r7 (29 Nov 2011)
+
+  29 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-workspace-4.7.3-r6.ebuild, +plasma-workspace-4.7.3-r7.ebuild,
+  +files/plasma-workspace-4.7.3-deletedwidget.patch:
+  Another crash fix, bug 389991
 
 *plasma-workspace-4.7.3-r6 (24 Nov 2011)
 
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 955df8630cfc..e23833d5fe0e 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -8,6 +8,7 @@ AUX plasma-workspace-4.6.2-panelplacement.patch 14030 RMD160 6040b6a7acba19073f8
 AUX plasma-workspace-4.6.3-dduplicate.patch 835 RMD160 5231815b4a8c64ebeb4b8d77bdfa46512bd50ea8 SHA1 ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d SHA256 ea36fb98ed122dc039b28337df028887919bced1b1413c04fcb9488dfc87e108
 AUX plasma-workspace-4.6.3-gpsdapi.patch 2233 RMD160 d3d51fa4a07ad4f3719060dfcd03af0c15fccb8c SHA1 f91d01066241cd3e78b825addf360db23716bf52 SHA256 29939f28bc8fa93041ebcb44bde05cd5151559ec314a87e2628388b1f38c2288
 AUX plasma-workspace-4.7.3-calendarcrash.patch 2262 RMD160 7153771cafc4bad99e4e824727a77346543c4b7d SHA1 1e2b634cd35be0382148e2973c51b6f0e03a9c3f SHA256 17dc4ef27bd8d8a9b90ab9bf82e9cb1ef91499158db16526dd701c8a1c70772b
+AUX plasma-workspace-4.7.3-deletedwidget.patch 1292 RMD160 39d67397ee176a323818a31c54b07a4d6bc01786 SHA1 ba0e3c603d30bc451755b16e42bffb53690f0444 SHA256 e5a9f7c7a7d69ffefcdcccb0166c6a86830b26a0fa968fbad9bba25388253169
 AUX plasma-workspace-4.7.3-layoutcrash.patch 945 RMD160 2b0f961d07323b0d6f6b32ef5d93c3fc269094ea SHA1 a720adb142ac7fbfb425cb1e300a83a49fcbf0b6 SHA256 e38be70e69f1cd09c0e80b09c140bf27c4ee44e0ce9db84e0ef701520e317abf
 AUX plasma-workspace-4.7.3-taskcrash.patch 9774 RMD160 3127550aaf2786bd418e44047474ce2766102dd3 SHA1 784c6bd6d6c0c9f0be2ed187949e4d1ddda11630 SHA256 980177f9e48481f6d593ff38c7214e3ed62a07f1690fe15b58aeda7d769e58df
 AUX plasma-workspace-4.7.3-weathercrash.patch 1248 RMD160 a6e636bb4a7718557ff9b90f96b838c0e518e196 SHA1 915594b561107980633da44a64d5b2da4d5dd968 SHA256 18f6af44a45841f1912eb73a0d3a93415b2665cd5e3e0352a13e58fc1ff7b141
@@ -18,23 +19,23 @@ DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338
 EBUILD plasma-workspace-4.6.3-r2.ebuild 3577 RMD160 d0ab587a6ecba68eae11c154bda402710792fc1e SHA1 586dd8977565a91c1ccc34767186fa0c413a8324 SHA256 1f2a8414b6939b95ebb960de43b1d958c91d6eff5cd8ef2b40552c4099296ff1
 EBUILD plasma-workspace-4.6.5.ebuild 3513 RMD160 b1169802a4c9b98b8ca5fe5b0f3a69050db3a74a SHA1 4980d0348ba428181bbe3b7d4cbec31dc5b998b4 SHA256 05d09ab7aa6a39159aa61ebcbf4179922c75baed5ee090912eea4f2c6c083a09
 EBUILD plasma-workspace-4.7.2-r1.ebuild 3464 RMD160 c3d04bb0978972b7d3fe51965146412db35f90e7 SHA1 aca6b98a355f2bc1e15cbd7bf3465c2c50d5da5c SHA256 752cb2e5e65a81af4af9ec67ac2e79c189e649afc082a4be5bd4b9727c5a0ffe
-EBUILD plasma-workspace-4.7.3-r6.ebuild 3650 RMD160 2b9ea670d0d3546c5dadd892c03ae0e5a682e6db SHA1 4b73c49f9edc37dee488aad854783c842b02e219 SHA256 91319533bbbc740e24f85488368ae4691a2139353049234e4ef1e460c98c2ed0
-MISC ChangeLog 22012 RMD160 8eab0452466612703caf8c4080615b137ce7e351 SHA1 a041a106d47136ff91a123516d5cbad297aa914f SHA256 11149608a7dde42bd9812cccc8679fa212eeb6c6538bcc9c197eb7ed70ed2fcf
+EBUILD plasma-workspace-4.7.3-r7.ebuild 3697 RMD160 2f56884ef83e9b2163cb3dc2f348ee8e96b0f171 SHA1 20529886ec62796ff3cf73dafad52b86e70daafc SHA256 336708789754cf55f64ef57b65f05013dddedff93bc6e34123af945711c2f99d
+MISC ChangeLog 22269 RMD160 ca53ee5963c74c28a0f907985a5a8502e2f7a634 SHA1 bc7cd8514d60a46891ad9bd1dc22aff288baedeb SHA256 5a23fd5ae0eae7fdaf0014dfc1eeef5fd1234b1bbe5cb42807bdedfed93254b7
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOzsY6AAoJENwGBM22xffeEc4P/ing/hp1/fy5wBxF+3LlxqQY
-kaUmOOi8oUglM5KwQNB9wY8QEhhaubd8lhcCOSryuxGPVWExh5OD8CAPpnmMlrYw
-Flrcf9OvKPX/RUoJ2TniOfpB1UjMHSLmq0mjV3ABGgbZ8GbR4kVFSU1XhFBfHMrC
-6qYfM4gTXwRwa+sLV01wEqZqqly5C8gTCIRdLyP7saYQZP43/wkLNqOMGbd7+nua
-hso5DniUR6HyQIKLTx2HxSnrdXU16DxYOOKaydR3bMZ67pCMQwxFw6Ucaddsb+VR
-2IK+cYH2SJR2+8+byylPbaV9h+cBJv7XXfg/H4VYCdnyYnkNn4Uo6rsa8UyfLtAe
-nBGQ0DyGUjtjEEsYHj38itCkwB4nJsdU9b722ci6D7ClnnR4/zwUthK5zB2cLPL4
-Y2sdFaBXHxnYl/p6orDrKj+tBaJrcsIRNv45Md64NbQovAYp8WgIwwFAiT8cky/r
-I0P7d2LcasQ88+mbRKUNRy7dHCtsL/3M8a/pTu9MBv9lst1Kw+aPTSa9p8huHlQq
-GVDV+r+C2G49oznwi/vWrpmmWIL7SwcZjIvPf2Li7an7AhrEQE9fN0RH1UbXYbAq
-/Z/2gszjeUCjnre+POm2FwTFU5FXtklbF+XyOzLnDQMAlBytjHxDrMlZQ365DiSR
-wQne0tw0v/2sKLLrY5rl
-=osN4
+iQIcBAEBCgAGBQJO1VNcAAoJENwGBM22xffenREQAJYuO15/yHlo7efxi3HJiL4+
+c+JbHRH4Ho18/U0L9Yd6FL+5sK5sf/9Rx1tu+mU8ceEEQfNNDTgwjE4yTXC+wS0/
+XyRDttgaVrwjRZdFi118Eipb1jgBFuWx395o6XwrXfWw6frXn0oQTWu+1FtrIQJV
+ITHHLNlN42a/oU9LEGS3725ZqqwU+IIaaGo3g2yTQq8ul+hsht4k5pmrA29GYhU1
+2nd/GH0qGDPgv0iYJCXrAbBsNoJ0RNYC9c7LqdFduoC088+bOucJnnHIdr51q3a2
+fd3niMxZb3gkzKnxcT/d3a6fo6w8cD1rDzlm2vAE5veqZC0SfaQSR66Gn1EUmCmc
+m5If8hdvWUMieVyXV9DstqxxL/DQxRNMbZEebxMA6QMrYRgV6lxSIT/ucJ7AcR6q
+VM2xdrr/5p7r7uf/YEzA/nWnqA3FBn/lktic0iJLqBXY31nA7J+ZYBgH7Svb7qYw
++6TmG+J2BxBxqLwnZtsV4CqtMW8Q+nxEgjwiyvj/Ml8r7KO2vIrPk6VhRdJg4vMg
+9M15S8KFV/auml8VKQf9ChwSpwks8mdEaqsv740LFuc4sqoxWM4N/O+TeE+wqmq+
+uhT61Dx7MgcCfZF+zgYt9jaEedr4cA/48GXBgRUchoaomPf7a8NeC0FY3Xx6MrUo
+/7H+5TMH9lZ/4p5YShm0
+=IsOh
 -----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch
new file mode 100644
index 000000000000..70f73675345e
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch
@@ -0,0 +1,40 @@
+commit 2d1deb4234aa3d43e2a7cc48fc1f6936bd2ff97c
+Author: Aaron Seigo <aseigo@kde.org>
+Date:   Wed Nov 9 17:11:50 2011 +0100
+
+    since the widget is being deleted, remove it from the collection
+    
+    BUG:286197
+    BUG:286195
+    BUG:264750
+    BUG:277367
+    BUG:280326
+    BUG:280072
+    BUG:282552
+    BUG:283061
+    BUG:284603
+    BUG:286177
+    BUG:286181
+
+diff --git a/plasma/generic/applets/systemtray/core/task.cpp b/plasma/generic/applets/systemtray/core/task.cpp
+index 5793102..1a02c24 100644
+--- a/plasma/generic/applets/systemtray/core/task.cpp
++++ b/plasma/generic/applets/systemtray/core/task.cpp
+@@ -101,7 +101,7 @@ QHash<Plasma::Applet *, QGraphicsWidget *> Task::widgetsByHost() const
+ 
+ void Task::abandon(Plasma::Applet *host)
+ {
+-    QGraphicsWidget *widget = d->widgetsByHost.value(host);
++    QGraphicsWidget *widget = d->widgetsByHost.take(host);
+     if (widget) {
+         widget->deleteLater();
+     }
+@@ -116,7 +116,7 @@ void Task::widgetDeleted()
+ {
+     bool wasEmbeddable = isEmbeddable();
+ 
+-    QGraphicsWidget * w = static_cast<QGraphicsWidget*>(sender());
++    QGraphicsWidget *w = static_cast<QGraphicsWidget*>(sender());
+     QMutableHashIterator<Plasma::Applet *, QGraphicsWidget *> it(d->widgetsByHost);
+     while (it.hasNext()) {
+         it.next();
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild
index ec2939d0f3c3..daecec894ddd 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild,v 1.1 2011/11/24 22:33:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild,v 1.1 2011/11/29 21:49:08 dilfridge Exp $
 
 EAPI=4
 
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.7.3-taskcrash.patch"
 	"${FILESDIR}/${PN}-4.7.3-calendarcrash.patch"
 	"${FILESDIR}/${PN}-4.7.3-layoutcrash.patch"
+	"${FILESDIR}/${PN}-4.7.3-deletedwidget.patch"
 )
 
 pkg_setup() {