Add workaround patch for plasma crash with kdepim-4.4, bug 364015

(Portage version: 2.1.9.46/cvs/Linux x86_64)

3 files changed, 41 insertions, 2 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 6d8805e501f8..28ab262662b7 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.97 2011/04/12 00:40:36 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.98 2011/04/18 19:29:32 dilfridge Exp $
+
+*plasma-workspace-4.6.2-r1 (18 Apr 2011)
+
+  18 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-workspace-4.6.2.ebuild, +plasma-workspace-4.6.2-r1.ebuild,
+  +files/plasma-workspace-4.6.2-oldpimcrash.patch:
+  Add workaround patch for plasma crash with kdepim-4.4, bug 364015
 
   12 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   plasma-workspace-4.6.2.ebuild:
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-oldpimcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-oldpimcrash.patch
new file mode 100644
index 000000000000..8600bfbad809
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-oldpimcrash.patch
@@ -0,0 +1,31 @@
+commit 3dbdc68fa9fb84fbcc63dbb9acffdf43a1ebfdda
+Author: Sergio Martins <iamsergio@gmail.com>
+Date:   Thu Apr 7 23:43:17 2011 +0100
+
+    Don't segfault in release mode.
+    
+    No idea why it's 0, but we're going to delete this copy of calendar.cpp soon,
+    so it's a waste of time to debugging it.
+    
+    PIM applications don't crash at all regarding this, in plasma the ETM is probably
+    set incorrectly and has items with unsupported payloads.
+    
+    BUG: 261593
+    (cherry picked from commit b2a322448e644cdf55b9990c90920ce8c0ffcc7f)
+
+diff --git a/plasma/generic/dataengines/calendar/akonadi/calendar.cpp b/plasma/generic/dataengines/calendar/akonadi/calendar.cpp
+index 9294f16..c5afa61 100644
+--- a/plasma/generic/dataengines/calendar/akonadi/calendar.cpp
++++ b/plasma/generic/dataengines/calendar/akonadi/calendar.cpp
+@@ -254,7 +254,10 @@ void Calendar::Private::updateItem( const Akonadi::Item &item, UpdateMode mode )
+   const Akonadi::Item::Id id = item.id();
+ 
+   const KCalCore::Incidence::Ptr incidence = CalendarSupport::incidence( item );
+-  Q_ASSERT( incidence );
++
++  if ( !incidence ) {
++    return;
++  }
+ 
+   // TODO: remove this debug message in a few months
+   kDebug() << "id=" << item.id()
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.2-r1.ebuild
index 7af1d9ecf147..7c4bdf007990 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.2-r1.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.6.2.ebuild,v 1.4 2011/04/12 00:40:36 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.2-r1.ebuild,v 1.1 2011/04/18 19:29:32 dilfridge Exp $
 
 EAPI=3
 
@@ -73,6 +73,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 	"${FILESDIR}/${PN}-4.6.2-optional_akonadi-server.patch"
+	"${FILESDIR}/${PN}-4.6.2-oldpimcrash.patch"
 )
 
 pkg_setup() {