Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-base/kmail
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-12-07 15:10:00 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-12-07 15:10:00 +0000
commit32ff1c9ccd8c66323290b0fc183056c8d66792a3 (patch)
tree4292cf3b18ed44ee2c0709a66c810530826cefb7 /kde-base/kmail
parentThis revision has the TDHF code enabled, which should now work properly with ... (diff)
downloadhistorical-32ff1c9ccd8c66323290b0fc183056c8d66792a3.tar.gz
historical-32ff1c9ccd8c66323290b0fc183056c8d66792a3.tar.bz2
historical-32ff1c9ccd8c66323290b0fc183056c8d66792a3.zip
Update patch for crash when using filters (#114655).
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'kde-base/kmail')
-rw-r--r--kde-base/kmail/ChangeLog9
-rw-r--r--kde-base/kmail/Manifest8
-rw-r--r--kde-base/kmail/files/digest-kmail-3.5.0-r2 (renamed from kde-base/kmail/files/digest-kmail-3.5.0-r1)0
-rw-r--r--kde-base/kmail/files/kdepim-3.5.0-filter-crash.patch60
-rw-r--r--kde-base/kmail/kmail-3.5.0-r2.ebuild (renamed from kde-base/kmail/kmail-3.5.0-r1.ebuild)2
5 files changed, 73 insertions, 6 deletions
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 5c47d95c8895..33ecd412b26d 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/kmail
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.43 2005/12/05 16:46:04 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.44 2005/12/07 15:10:00 greg_g Exp $
+
+*kmail-3.5.0-r2 (07 Dec 2005)
+
+ 07 Dec 2005; Gregorio Guidi <greg_g@gentoo.org>
+ files/kdepim-3.5.0-filter-crash.patch, -kmail-3.5.0-r1.ebuild,
+ +kmail-3.5.0-r2.ebuild:
+ Update patch for crash when using filters (#114655).
*kmail-3.5.0-r1 (05 Dec 2005)
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 18d25868a9d9..a1ded1b564c3 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -3,18 +3,18 @@ MD5 393bf626aee24f4dd500ca341e1d314c kmail-3.4.2-r1.ebuild 1856
MD5 0517daa346612e50e60119680a33a3da kmail-3.4.2.ebuild 1629
MD5 f0881d6600f939394e4b0c3dc126a75f kmail-3.4.3.ebuild 1728
MD5 77f5791ea5ee7556ab81edc5ff9eaeec kmail-3.5.0.ebuild 1719
-MD5 bf8785ec09f5a55ce9c5915d8d72ed06 ChangeLog 5546
+MD5 c4ab860a114fd739ba0f2f557ca71d4a ChangeLog 5774
MD5 aa82a9cf16faab980f09bd8763b742d1 kmail-3.4.1.ebuild 1610
MD5 b9964e02eff2a443f6299bb15de581b4 kmail-3.4.1-r1.ebuild 1674
-MD5 3b7085a76e947a5a10621de328ce2c26 kmail-3.5.0-r1.ebuild 1847
+MD5 35220f79f0101715d357de785698b984 kmail-3.5.0-r2.ebuild 1847
MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1-r1 208
MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2-r1 282
MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756
MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516
-MD5 0d54c227778b58ec3fe43ff06458816d files/kdepim-3.5.0-filter-crash.patch 2940
-MD5 0b5d543dd13db98ba9001990b2e77964 files/digest-kmail-3.5.0-r1 67
+MD5 56d28e464c42d572965eae767222415b files/kdepim-3.5.0-filter-crash.patch 5484
MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kmail-3.4.3 67
MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208
+MD5 0b5d543dd13db98ba9001990b2e77964 files/digest-kmail-3.5.0-r2 67
MD5 9375e74788e629b37a3636e9a64804e0 files/kmail-qt-3.3.5.patch 446
MD5 0b5d543dd13db98ba9001990b2e77964 files/digest-kmail-3.5.0 67
MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2 282
diff --git a/kde-base/kmail/files/digest-kmail-3.5.0-r1 b/kde-base/kmail/files/digest-kmail-3.5.0-r2
index 8cfd9db2e7e4..8cfd9db2e7e4 100644
--- a/kde-base/kmail/files/digest-kmail-3.5.0-r1
+++ b/kde-base/kmail/files/digest-kmail-3.5.0-r2
diff --git a/kde-base/kmail/files/kdepim-3.5.0-filter-crash.patch b/kde-base/kmail/files/kdepim-3.5.0-filter-crash.patch
index 0120d7afc3a2..90193e24574d 100644
--- a/kde-base/kmail/files/kdepim-3.5.0-filter-crash.patch
+++ b/kde-base/kmail/files/kdepim-3.5.0-filter-crash.patch
@@ -1,3 +1,45 @@
+diff -Nur kdepim-3.5.0.orig/kmail/actionscheduler.cpp kdepim-3.5.0/kmail/actionscheduler.cpp
+--- kdepim-3.5.0.orig/kmail/actionscheduler.cpp 2005-09-10 10:24:02.000000000 +0200
++++ kdepim-3.5.0/kmail/actionscheduler.cpp 2005-12-07 14:48:06.000000000 +0100
+@@ -570,7 +570,7 @@
+ (!mAccount ||
+ (mAccount && (*mFilterIt).applyOnAccount(mAccountId)))) ||
+ ((mSet & KMFilterMgr::Explicit) && (*mFilterIt).applyOnExplicit())) {
+-
++
+ // filter is applicable
+ if ( FilterLog::instance()->isLogging() ) {
+ QString logText( i18n( "<b>Evaluating filter rules:</b> " ) );
+@@ -646,8 +646,11 @@
+ if (!orgMsg || !orgMsg->parent()) {
+ // Original message is gone, no point filtering it anymore
+ mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
++ kdDebug(5006) << "The original serial number is missing. "
++ << "Cannot complete the filtering." << endl;
+ mExecutingLock = false;
+ processMessageTimer->start( 0, true );
++ return;
+ } else {
+ if (!folder) // no filter folder specified leave in current place
+ folder = orgMsg->parent();
+@@ -659,7 +662,7 @@
+ mSrcFolder->addMsg( msg );
+ mIgnore = false;
+
+- if (msg && kmkernel->folderIsTrash( folder ))
++ if (msg && folder && kmkernel->folderIsTrash( folder ))
+ KMFilterAction::sendMDN( msg, KMime::MDN::Deleted );
+
+ timeOutTime = QTime::currentTime();
+@@ -722,8 +725,6 @@
+
+ void ActionScheduler::copyMessageFinished( KMCommand *command )
+ {
+- // FIXME remove the debug output
+- kdDebug(5006) << "##### ActionScheduler::copyMessageFinished( KMCommand *command )" << endl;
+ if ( command->result() != KMCommand::OK )
+ actionMessage( KMFilterAction::ErrorButGoOn );
+ else
diff -Nur kdepim-3.5.0.orig/kmail/kmcommands.cpp kdepim-3.5.0/kmail/kmcommands.cpp
--- kdepim-3.5.0.orig/kmail/kmcommands.cpp 2005-10-10 17:02:11.000000000 +0200
+++ kdepim-3.5.0/kmail/kmcommands.cpp 2005-12-05 15:16:02.000000000 +0100
@@ -56,6 +98,24 @@ diff -Nur kdepim-3.5.0.orig/kmail/kmcommands.cpp kdepim-3.5.0/kmail/kmcommands.c
}
FolderShortcutCommand::FolderShortcutCommand( KMMainWidget *mainwidget,
+diff -Nur kdepim-3.5.0.orig/kmail/kmfilteraction.cpp kdepim-3.5.0/kmail/kmfilteraction.cpp
+--- kdepim-3.5.0.orig/kmail/kmfilteraction.cpp 2005-09-10 10:24:02.000000000 +0200
++++ kdepim-3.5.0/kmail/kmfilteraction.cpp 2005-12-07 14:48:06.000000000 +0100
+@@ -1630,7 +1630,14 @@
+ pclose(p);
+ if ( !ba.isEmpty() ) {
+ KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", QString(ba).latin1() );
++ KMFolder *filterFolder = mMsg->parent();
+ mMsg->fromByteArray( ba );
++ if ( filterFolder ) {
++ filterFolder->take( filterFolder->find( mMsg ) );
++ filterFolder->addMsg( mMsg );
++ } else {
++ kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl;
++ }
+ }
+
+ KPIM::ThreadWeaver::debug (1, "PipeJob::run: done.\n" );
diff -Nur kdepim-3.5.0.orig/kmail/kmkernel.cpp kdepim-3.5.0/kmail/kmkernel.cpp
--- kdepim-3.5.0.orig/kmail/kmkernel.cpp 2005-11-08 23:33:29.000000000 +0100
+++ kdepim-3.5.0/kmail/kmkernel.cpp 2005-12-05 15:16:02.000000000 +0100
diff --git a/kde-base/kmail/kmail-3.5.0-r1.ebuild b/kde-base/kmail/kmail-3.5.0-r2.ebuild
index f02ad095458e..a87ba3510338 100644
--- a/kde-base/kmail/kmail-3.5.0-r1.ebuild
+++ b/kde-base/kmail/kmail-3.5.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.0-r1.ebuild,v 1.1 2005/12/05 16:46:04 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.0-r2.ebuild,v 1.1 2005/12/07 15:10:00 greg_g Exp $
KMNAME=kdepim
MAXKDEVER=$PV