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

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 64 insertions, 4 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/Manifest b/kde-base/plasma-workspace/Manifest
index bacce74d6015..d1171ce70834 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
+AUX plasma-workspace-4.6.2-oldpimcrash.patch 1220 RMD160 67982a1e2513d03ba94abed3bb173f35e1b80a22 SHA1 d7772213e89aed087672d57b97de81c3626800f7 SHA256 059bbe148d3af039d3523d494e3619dc44531bc53765d7944a6f5ce66cee2a1c
 AUX plasma-workspace-4.6.2-optional_akonadi-server.patch 4897 RMD160 64260bce383713701f89243a57398378644d947d SHA1 df1370fc82e074b6bea7dff876129b6ff116418c SHA256 33620a0a68006f7382bbb85ef288cda03814bb0cd5972342214fbeb3b4a7927e
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02bd78d546c71e0 SHA1 63efb68733f347d0b7d24a7a061c5a0e3f84dee7 SHA256 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
 EBUILD plasma-workspace-4.4.5.ebuild 2909 RMD160 06e2be7bd9bc3c28c510c7880e69d4aec15ba415 SHA1 59a3bc64bedef03958d9844cead6ed65d8c37e71 SHA256 39714c6a68948f4b4ad804ebdc94572d7d266249a71c2e9338850ca60cd2c59c
-EBUILD plasma-workspace-4.6.2.ebuild 3467 RMD160 5f85423708855cedb2a70d716531518b84c1de2a SHA1 6ff7533610568aaf30bb405c4f636761a72e8d2c SHA256 36e9b8e833e6192359ff7d16c968332221913746102f247f36fcfaad9445e825
-MISC ChangeLog 14625 RMD160 2720c44d825d0311a0ee5cdc3acf333691d4aab3 SHA1 c9dca2b27bfe7854d9972298c4bed4dd4b86f20b SHA256 d452dae5295f1b921699215c070bbbac3aae4590a0a3ff2b49481f1f90c65dc3
+EBUILD plasma-workspace-4.6.2-r1.ebuild 3515 RMD160 f9a3eb8b1ae1ebca3ae3af2bfff949c972aeb041 SHA1 52e3a631bfe256fbdb77ef4b467489f01c4020e8 SHA256 3cf03430125af38989c905ba55e013a9176d61456211c346beb58426b5084e25
+MISC ChangeLog 14913 RMD160 54eb4e5b71c5de5897677b76f47adfda53ab5743 SHA1 1a98a6a506fb208a330087ad8cce43f18d2b8bb5 SHA256 dee2e4e0420bc900d54369ec1e1750fe017a08626a159ef02a3e0d6d5ec2ac88
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNrJHUAAoJENwGBM22xffeVHcP+wYG9xP628VRvsNpCgsocWw4
+rYv+larvmw4co50d2KXmxA596h4q1dnqlisatgFaeFJgXVKVivYaZfqOmANMx8+a
+nvstdfF1QW/N9GkRFx1sVVbW7ADqeKwSYOVbt22Hp8ehWjw4U/wF2a5Roid+d3gR
+l9PUOy6tyNUhMOxyCG+9Q0O6nC5gpVee4m1GCYMrkzx6X6sZt5B8mptuigJDpi/Z
+m1BdYnEd4WP9Ek9el9w0cT6j5vJND348P9vlGrivgDA2Yh/7rQQUNzp1KagyPT6z
+E7vpG4QDO2r4wlTyqdfFN4J5BI8JRfVDxchutGDTBgHmgAFAP/8IAkhJbZmRWt9J
+JoYZKziyM94DTrSB2aX5rjFkTnYIQuMZIBYzgcMJbguVN9Y7oA3POGUBUtlSmYCH
+BxivDxRG2qUHMBaLVGTGpcl+sqXi3na7/CP/i3dIS1qVFN5lisHmikti4y0atij1
+8iRo/WGvUBbeEngxaIisWanwuObNgSf3ASZ9tgxt6zRFncZlsdbZBYocFx1HTkka
+Va6F0nzrzp98pi2ofNHzMrubVXxSFsHNVJrtC5uFszn0fojWjQRxzG7N9Ohh3nOW
+11N3onNQg9BtyqPD9Cv6OslTMWHP88EKB4ePl15P/u+X1eu4Cy4HrzLtAhYIfTyU
+he4r9+UfzhEqMJPodkz7
+=pAZt
+-----END PGP SIGNATURE-----
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() {