[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-crash-in-plasma.patch)

[Andrea Scarpino]

    Date: Wednesday, February 2, 2011 @ 18:03:04
  Author: andrea
Revision: 108767

upgpkg: kdelibs 4.6.0-2
patch to fix a plasma crash on exit (FS#22712)

Added:
  kdelibs/trunk/fix-crash-in-plasma.patch
Modified:
  kdelibs/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   11 ++++++++---
 fix-crash-in-plasma.patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-02 21:02:58 UTC (rev 108766)
+++ PKGBUILD	2011-02-02 23:03:04 UTC (rev 108767)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -19,11 +19,13 @@
 replaces=('arts' 'kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch'
+        'fix-crash-in-plasma.patch')
 sha1sums=('6ea3fc69f98fa91c5159ccd743d4d548e801c7bc'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb')
+          'd994f262356af5b9e4e9619646e471bd98c91efb'
+          '270f24d9682c32c9f69b3e6e13696888724c5169')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,6 +37,9 @@
        # add syntax highlightning for PKGBUILD and .install files
        patch -p1 -i $srcdir/abs-syntax-highlight.patch
 
+       # Already fixed upstream
+       patch -Np1 -i ${srcdir}/fix-crash-in-plasma.patch
+
        cd ${srcdir}
        mkdir build
        cd build

Added: fix-crash-in-plasma.patch
===================================================================
--- fix-crash-in-plasma.patch	                        (rev 0)
+++ fix-crash-in-plasma.patch	2011-02-02 23:03:04 UTC (rev 108767)
@@ -0,0 +1,22 @@
+commit 709f75ac353cd735ccac31f87363ea90dde345d3
+Author: Marco Martin <notmart at 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"));