4 files changed, 78 insertions, 17 deletions
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 322884d43695..f5c3d7eb71c9 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.134 2011/11/20 22:04:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.135 2011/11/22 22:49:57 dilfridge Exp $
+
+*plasma-workspace-4.7.3-r5 (22 Nov 2011)
+
+  22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-workspace-4.7.3-r4.ebuild, +plasma-workspace-4.7.3-r5.ebuild,
+  +files/plasma-workspace-4.7.3-calendarcrash.patch:
+  Backport another crash fix, bug 391355
 
 *plasma-workspace-4.7.3-r4 (20 Nov 2011)
 
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index c63b9e3dc8eb..b1a6b9ba85ce 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -7,6 +7,7 @@ AUX plasma-workspace-4.6.2-optional_akonadi-server.patch 4897 RMD160 64260bce383
 AUX plasma-workspace-4.6.2-panelplacement.patch 14030 RMD160 6040b6a7acba19073f81483d4b6823638f791a22 SHA1 0e5b825b4d15362a0872f6d54f58c3f1ba4c174c SHA256 71ff67df3956806c9d949780245719dcea6837953ed555e6e7c5773dc3fbacb6
 AUX plasma-workspace-4.6.3-dduplicate.patch 835 RMD160 5231815b4a8c64ebeb4b8d77bdfa46512bd50ea8 SHA1 ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d SHA256 ea36fb98ed122dc039b28337df028887919bced1b1413c04fcb9488dfc87e108
 AUX plasma-workspace-4.6.3-gpsdapi.patch 2233 RMD160 d3d51fa4a07ad4f3719060dfcd03af0c15fccb8c SHA1 f91d01066241cd3e78b825addf360db23716bf52 SHA256 29939f28bc8fa93041ebcb44bde05cd5151559ec314a87e2628388b1f38c2288
+AUX plasma-workspace-4.7.3-calendarcrash.patch 2262 RMD160 7153771cafc4bad99e4e824727a77346543c4b7d SHA1 1e2b634cd35be0382148e2973c51b6f0e03a9c3f SHA256 17dc4ef27bd8d8a9b90ab9bf82e9cb1ef91499158db16526dd701c8a1c70772b
 AUX plasma-workspace-4.7.3-taskcrash.patch 9774 RMD160 3127550aaf2786bd418e44047474ce2766102dd3 SHA1 784c6bd6d6c0c9f0be2ed187949e4d1ddda11630 SHA256 980177f9e48481f6d593ff38c7214e3ed62a07f1690fe15b58aeda7d769e58df
 AUX plasma-workspace-4.7.3-weathercrash.patch 1248 RMD160 a6e636bb4a7718557ff9b90f96b838c0e518e196 SHA1 915594b561107980633da44a64d5b2da4d5dd968 SHA256 18f6af44a45841f1912eb73a0d3a93415b2665cd5e3e0352a13e58fc1ff7b141
 DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
@@ -16,23 +17,23 @@ DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338
 EBUILD plasma-workspace-4.6.3-r2.ebuild 3577 RMD160 d0ab587a6ecba68eae11c154bda402710792fc1e SHA1 586dd8977565a91c1ccc34767186fa0c413a8324 SHA256 1f2a8414b6939b95ebb960de43b1d958c91d6eff5cd8ef2b40552c4099296ff1
 EBUILD plasma-workspace-4.6.5.ebuild 3513 RMD160 b1169802a4c9b98b8ca5fe5b0f3a69050db3a74a SHA1 4980d0348ba428181bbe3b7d4cbec31dc5b998b4 SHA256 05d09ab7aa6a39159aa61ebcbf4179922c75baed5ee090912eea4f2c6c083a09
 EBUILD plasma-workspace-4.7.2-r1.ebuild 3464 RMD160 c3d04bb0978972b7d3fe51965146412db35f90e7 SHA1 aca6b98a355f2bc1e15cbd7bf3465c2c50d5da5c SHA256 752cb2e5e65a81af4af9ec67ac2e79c189e649afc082a4be5bd4b9727c5a0ffe
-EBUILD plasma-workspace-4.7.3-r4.ebuild 3558 RMD160 ffab83aaa6de5d7a2ca0a60cbbc7aca6d9cdc804 SHA1 8f386e1f5995402049ea6f3fa20586528c1ebf6f SHA256 21f73851d9f045c87724072efe40cd378910cb74ba537aeb94c34232c1e992fd
-MISC ChangeLog 21476 RMD160 da9a00137afe879125c7a9f7f8751e01b243ffdc SHA1 90748948dafc943e351d63d8c54ce4da6b0ceea5 SHA256 09229e44f5cb3d0fea427f2330001a7f3460437d4db35c94ace190eaf8ce8f7b
+EBUILD plasma-workspace-4.7.3-r5.ebuild 3605 RMD160 9e7819b3bb1f8fd2b2c333866c7bbe1118a90efc SHA1 1e97b606a3753a730bb41b5b8cf30921cf61927c SHA256 6708f79cf5f11501ffcdab8f646821255c3d0911acf0bfb75ad284cc7f99cfc3
+MISC ChangeLog 21742 RMD160 cf102a59efc2ec592eb12bde939d36495058f392 SHA1 7e1a2d22e52c804a8d48800cda48daae18ccbcca SHA256 f542745d877afe5e9304610399ccb2701aedf77e28b63975b5dde7415459e318
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOyXlkAAoJENwGBM22xffe1JMP/R39rHFvyRDYMK/1toYpU7It
-iAqV+oPJ3LfGBMIU6IHx1E0AxAePGhECJbsXXM7xXkaGzeRSrSIa5mtsTargNVEb
-L2R7QH60sUILB73YRDRDCPEW+XloaKPXKkgQwijaNXE7SOSkqUeoyY4sfW+FaAF8
-nHjHUNsXD449SnuwCzOzkAE8fwcIWIu3vfwkY4M5veOmaQdXCN43tSbmcQpzeMec
-kOyJf2IwElOu+3nLV1aoWiB+JB6pBZsUHmFTUrN3aeAUa8y2BSZDRSud2fTdaVnu
-FdQI8n41g7gXlVmeZ5BIW9HHxXXiEpHMBru60Ht8tnGgwEEHwwRwNi0/N9fBCaLX
-aNutpXOwjyIzTOfIr1+yqL9PDs0CwOtP4ROZRAyU0eeSsYcLs6SaBu97npfMvIde
-4tfsmOeiI5Hcgme/xlDJ/pnqLxNFDJExBnD8sc3+M2lKHR+YwnD5wdyFTiym8Sfg
-82lS0Yv8JpuU21ivQ6sZv+ea3DhhYCDm+ZlvA5o/jPYP4QeGfuH5kS8SXE9m0vEe
-PYAO2iMq0chUZ5uRwUCr0BvyzA6hS4JlOY1bfXND8Vcj4+GLyKMOXjN6/rBb81q6
-x3HCqpMBpw1ADAHhhA3T37NqeVY9+jBK+NCAQpoydMKwcXCX4jgseGA9bQUZJ8Dk
-+Z4o0F0vvzWzajnrSSeo
-=wV6X
+iQIcBAEBCgAGBQJOzCcbAAoJENwGBM22xffeh3sQAKsN4/ZY71usm99Mb72ozg8c
+Obg6Cn2RIg8XwIKFs3SQ1kAhmkj8XWg321A8RGsrquDGykpaT8mycbl5lrB0RzNo
+Y69w6odKEsr/wgGrPBdnFuOqOVhThLFJbUYNhyctbhlX16yemnW/4HLA9zUIK+xw
+K/rQ4ivA+f+1gm35GlMHDLJO3Bt8r12OfUNat22d/mqAhTqtaPjhZMQdygv9tHNd
+cNOe/TgUBQ+u44UjSvaiEz+S/XZZQpe6rPxKBZqxwIIZ5+0pCrjh3XDE3KpMNXmU
+Cd/S6mQ4OVIjV/QBrP/jwUBX9KqdzYJBCHpzZHIA6SWbfP7uoM2A+SoLiiu0llGP
+HXXyuqzjN/dYWOnZM1+qxjUrh4iLZrEbeH2o+CqbFcZ6qw9reqHZgeZKUIxXjMMq
+vaFkVij95pQZO0HGUWahQHKxNQQf9nsxPuA7FdTG/cH3UJSsDw7JNXldnjDnioAf
+30y4M/5S0ewmhR1vci/0ab52l+PP6UNvw50r6l/MLGzGEsZuPzMIor6gQqvhi2I5
+0TZZfpA6KsS32ttL8tiKy6WehCJqyntAQphQEniePzHlRT2vmf03a1163mc3g4oG
+U94WvpeBg9cZzyCale/A2wGL3B5knj8ACf9aY4UNgx2Eqj8Ppi6y88I3v2k/WQ73
+0VajT9PO7+DcqoQWTl/b
+=qbOI
 -----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch
new file mode 100644
index 000000000000..705daf65b4b3
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch
@@ -0,0 +1,52 @@
+commit 44a9c26b9eb27df8297618764f988972d476dc84
+Author: David E. Narváez <david.narvaez@computer.org>
+Date:   Sun Nov 20 16:31:15 2011 -0500
+
+    Drop InvisibleCollectionFetch in Favor of KDescendantsProxyModel
+    
+    As the InvisibleCollectionFetch fetch strategy is currently broken, I
+    implemented a suggestion by Christian Mollekopf of working around the
+    issues by flatting the model through a KDescendantsProxyModel to fix
+    crashes in Plasma related to calendars.
+    
+    BUG: 279322
+    FIXED-IN: 4.7.4
+    
+    CCMAIL: chrigi_1@fastmail.fm
+    REVIEW: 103088
+
+diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
+index 53f98c0..f8b3a90 100644
+--- a/plasma/generic/dataengines/calendar/calendarengine.cpp
++++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
+@@ -31,6 +31,7 @@
+ #include <KCalCore/Event>
+ #include <KCalCore/Todo>
+ #include <KCalCore/Journal>
++#include <kdescendantsproxymodel.h>
+ 
+ #ifdef AKONADI_FOUND
+ #include <Akonadi/ChangeRecorder>
+@@ -38,6 +39,7 @@
+ #include <Akonadi/Collection>
+ #include <Akonadi/ItemFetchScope>
+ #include <Akonadi/EntityDisplayAttribute>
++#include <Akonadi/EntityMimeTypeFilterModel>
+ 
+ #include "akonadi/calendar.h"
+ #include "akonadi/calendarmodel.h"
+@@ -341,8 +343,12 @@ void CalendarEngine::initAkonadiCalendar()
+ 
+     // create the models that contain the data. they will be updated automatically from akonadi.
+     CalendarSupport::CalendarModel *calendarModel = new CalendarSupport::CalendarModel(monitor, this);
+-    calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
+-    m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
++    KDescendantsProxyModel *flatModel = new KDescendantsProxyModel(this);
++    flatModel->setSourceModel(calendarModel);
++    Akonadi::EntityMimeTypeFilterModel *mimeFilteredModel = new Akonadi::EntityMimeTypeFilterModel(this);
++    mimeFilteredModel->addMimeTypeExclusionFilter(Akonadi::Collection::mimeType());
++    mimeFilteredModel->setSourceModel(flatModel);
++    m_calendar = new CalendarSupport::Calendar(mimeFilteredModel, mimeFilteredModel, KSystemTimeZones::local());
+ }
+ #endif
+ 
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r4.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r5.ebuild
index 9a163a494d48..cb013fc5683a 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r4.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r5.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.7.3-r4.ebuild,v 1.1 2011/11/20 22:04:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r5.ebuild,v 1.1 2011/11/22 22:49:57 dilfridge Exp $
 
 EAPI=4
 
@@ -76,6 +76,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 	"${FILESDIR}/${PN}-4.7.3-weathercrash.patch"
 	"${FILESDIR}/${PN}-4.7.3-taskcrash.patch"
+	"${FILESDIR}/${PN}-4.7.3-calendarcrash.patch"
 )
 
 pkg_setup() {