[gentoo-commits] proj/kde:master commit in: kde-base/kmail/, kde-base/kmail/files/

[Johannes Huber]

commit:     7dbb0c38ac35c30694b0017964f307e22acc2add
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 15 18:56:31 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 19:49:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dbb0c38

[kde-base/kmail] Revision bump adds upstream patch

Fixes upstream bug #345071

Package-Manager: portage-2.2.14

 kde-base/kmail/files/kmail-4.14.6-fix-crash.patch   | 21 +++++++++++++++++++++
 .../{kmail-4.14.6.ebuild => kmail-4.14.6-r1.ebuild} |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch 
b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
new file mode 100644
index 0000000..308d98d
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
@@ -0,0 +1,21 @@
+commit b6196bc1fd489a5be69731ca9a19d8a95f721570
+Author: Montel Laurent <mon...@kde.org>
+Date:   Thu Mar 12 07:48:15 2015 +0100
+
+    Fix Bug 345071 - KMail crashed while I was reading an email
+    
+    BUG: 345071
+    FIXED-IN: 4.16.7
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 2228aef..92ba8c5 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -4498,5 +4498,6 @@ void KMMainWidget::populateMessageListStatusFilterCombo()
+ 
+ void KMMainWidget::slotCollectionRemoved(const Akonadi::Collection &col)
+ {
+-    mFavoritesModel->removeCollection(col);
++    if (mFavoritesModel)
++       mFavoritesModel->removeCollection(col);
+ }

diff --git a/kde-base/kmail/kmail-4.14.6.ebuild 
b/kde-base/kmail/kmail-4.14.6-r1.ebuild
similarity index 98%
rename from kde-base/kmail/kmail-4.14.6.ebuild
rename to kde-base/kmail/kmail-4.14.6-r1.ebuild
index 44034e2..1647f4c 100644
--- a/kde-base/kmail/kmail-4.14.6.ebuild
+++ b/kde-base/kmail/kmail-4.14.6-r1.ebuild
@@ -27,6 +27,8 @@ RDEPEND="
 RESTRICT="test"
 # bug 393147
 
+PATCHES=( "${FILESDIR}/${P}-fix-crash.patch" )
+
 KMEXTRACTONLY="
        agents/folderarchiveagent.desktop
        agents/sendlateragent/