diff options
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch | 22 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.6.0.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 2b424fe42e37..ea6c75d9046c 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.716 2011/01/26 20:28:53 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.717 2011/02/02 02:11:33 dilfridge Exp $ + + 02 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kdelibs-4.6.0.ebuild, +files/kdelibs-4.6.0-logoutcrash.patch: + Added fix for crash on logout/reboot/shutdown. Thanks lxnay and aseigo. *kdelibs-4.6.0 (26 Jan 2011) diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch new file mode 100644 index 000000000000..5fd8d0a5c313 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch @@ -0,0 +1,22 @@ +commit 709f75ac353cd735ccac31f87363ea90dde345d3 +Author: Marco Martin <notmart@gmail.com> +Date: Tue Feb 1 21:15:49 2011 +0100 + + don't collapse when it's destroying + try to not crash upon deletion of the extender + +diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp +index bdbc886..3e5809f 100644 +--- a/plasma/extenders/extenderitem.cpp ++++ b/plasma/extenders/extenderitem.cpp +@@ -596,6 +596,10 @@ void ExtenderItem::destroy() + + void ExtenderItem::setCollapsed(bool collapsed) + { ++ if (extender()->d->destroying) { ++ return; ++ } ++ + config().writeEntry("isCollapsed", collapsed); + d->collapsed = collapsed; + d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget")); diff --git a/kde-base/kdelibs/kdelibs-4.6.0.ebuild b/kde-base/kdelibs/kdelibs-4.6.0.ebuild index d5a4771b7505..77d178912101 100644 --- a/kde-base/kdelibs/kdelibs-4.6.0.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.0.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/kdelibs/kdelibs-4.6.0.ebuild,v 1.1 2011/01/26 20:28:53 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.0.ebuild,v 1.2 2011/02/02 02:11:33 dilfridge Exp $ EAPI="3" @@ -133,6 +133,7 @@ PATCHES=( # "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" "${FILESDIR}/${PN}-4.4.90-xslt.patch" + "${FILESDIR}/${PN}-4.6.0-logoutcrash.patch" ) src_prepare() { |