From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 793A6138CBF for ; Mon, 16 Mar 2015 19:49:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B492E08C7; Mon, 16 Mar 2015 19:49:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADF66E08C7 for ; Mon, 16 Mar 2015 19:49:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B43834098B for ; Mon, 16 Mar 2015 19:49:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E391913E24 for ; Mon, 16 Mar 2015 19:49:51 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1426535358.7dbb0c38ac35c30694b0017964f307e22acc2add.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kmail/, kde-base/kmail/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kmail/files/kmail-4.14.6-fix-crash.patch kde-base/kmail/kmail-4.14.6-r1.ebuild kde-base/kmail/kmail-4.14.6.ebuild X-VCS-Directories: kde-base/kmail/files/ kde-base/kmail/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 7dbb0c38ac35c30694b0017964f307e22acc2add X-VCS-Branch: master Date: Mon, 16 Mar 2015 19:49:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 74151d70-96ea-452c-a44b-2551f6855a50 X-Archives-Hash: 95edde674c46d524c3c9b4f962e5aef1 commit: 7dbb0c38ac35c30694b0017964f307e22acc2add Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Mar 15 18:56:31 2015 +0000 Commit: Johannes Huber gentoo 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 +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/