diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-29 21:49:08 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-29 21:49:08 +0000 |
| commit | 17d2f35c2ca225afdd8a89ad4dd59174c7ed82ff (patch) | |
| tree | 792ae96be5e394cc21a9156d643c073ce86770ab /kde-base/plasma-workspace | |
| parent | Make new ~arch revision, hard-disable upnp in revision for stable request (diff) | |
| download | gentoo-2-17d2f35c2ca225afdd8a89ad4dd59174c7ed82ff.tar.gz gentoo-2-17d2f35c2ca225afdd8a89ad4dd59174c7ed82ff.tar.bz2 gentoo-2-17d2f35c2ca225afdd8a89ad4dd59174c7ed82ff.zip | |
Another crash fix, bug 389991
(Portage version: 2.1.10.37/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/plasma-workspace')
| -rw-r--r-- | kde-base/plasma-workspace/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch | 40 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild (renamed from kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild) | 3 |
3 files changed, 50 insertions, 2 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/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() { |