diff --git a/kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch b/kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch new file mode 100644 index 0000000..5fd8d0a --- /dev/null +++ b/kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch @@ -0,0 +1,22 @@ +commit 709f75ac353cd735ccac31f87363ea90dde345d3 +Author: Marco Martin +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/kdelibs.spec b/kdelibs.spec index 53403d4..1041348 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -16,7 +16,7 @@ Summary: KDE Libraries Version: 4.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Name: kdelibs Epoch: 6 @@ -91,6 +91,8 @@ Patch27: kdelibs-4.5.80-no_rpath.patch Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch ## trunk (4.6) upstream +# fix kde#264076 - Plasma 4.6 crash on logout +Patch100: kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -274,6 +276,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch50 -p1 -b .knewstuff_gpg2 # upstream patches +%patch100 -p1 -b .fix-plasma-logout-crash-kde264076 # security fix %patch200 -p1 -b .CVE-2009-2702 @@ -529,6 +532,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 21 2011 Jaroslav Reznik - 4.6.0-4 +- Fix plasma logout crash (kde#264076) + * Mon Feb 07 2011 Fedora Release Engineering - 6:4.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild