Add patch to fix crash when using filters (#114118).

(Portage version: 2.0.51.22-r3)

4 files changed, 140 insertions, 1 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 478e047a4098..5c47d95c8895 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2005/12/04 11:52:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.43 2005/12/05 16:46:04 greg_g Exp $
+
+*kmail-3.5.0-r1 (05 Dec 2005)
+
+  05 Dec 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.5.0-filter-crash.patch, +kmail-3.5.0-r1.ebuild:
+  Add patch to fix crash when using filters (#114118).
 
   04 Dec 2005; Bryan Østergaard <kloeri@gentoo.org> kmail-3.5.0.ebuild:
   ~alpha keyword.
diff --git a/kde-base/kmail/files/digest-kmail-3.5.0-r1 b/kde-base/kmail/files/digest-kmail-3.5.0-r1
new file mode 100644
index 000000000000..8cfd9db2e7e4
--- /dev/null
+++ b/kde-base/kmail/files/digest-kmail-3.5.0-r1
@@ -0,0 +1 @@
+MD5 e19a2a40e422ecd483884ce6e9ac8925 kdepim-3.5.0.tar.bz2 12865623
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
new file mode 100644
index 000000000000..0120d7afc3a2
--- /dev/null
+++ b/kde-base/kmail/files/kdepim-3.5.0-filter-crash.patch
@@ -0,0 +1,75 @@
+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
+@@ -1496,30 +1496,30 @@
+ 
+ void KMMetaFilterActionCommand::start()
+ {
+-#if 0 // use action scheduler
+-  KMFilterMgr::FilterSet set = KMFilterMgr::All;
+-  QPtrList<KMFilter> filters;
+-  filters.append( mFilter );
+-  ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
+-  scheduler->setAlwaysMatch( true );
+-  scheduler->setAutoDestruct( true );
+-
+-  int contentX, contentY;
+-  HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
+-  QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
+-  mHeaders->finalizeMove( nextItem, contentX, contentY );
+-
+-
+-  for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
+-    scheduler->execFilters( msg );
+-#else
+-  KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
+-  *mHeaders->selectedMsgs(), mFilter);
+-  filterCommand->start();
+-  int contentX, contentY;
+-  HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
+-  mHeaders->finalizeMove( item, contentX, contentY );
+-#endif
++  if (ActionScheduler::isEnabled() ) {
++    // use action scheduler
++    KMFilterMgr::FilterSet set = KMFilterMgr::All;
++    QValueList<KMFilter*> filters;
++    filters.append( mFilter );
++    ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
++    scheduler->setAlwaysMatch( true );
++    scheduler->setAutoDestruct( true );
++
++    int contentX, contentY;
++    HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
++    QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
++    mHeaders->finalizeMove( nextItem, contentX, contentY );
++
++    for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
++      scheduler->execFilters( msg );
++  } else {
++    KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
++    *mHeaders->selectedMsgs(), mFilter);
++    filterCommand->start();
++    int contentX, contentY;
++    HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
++    mHeaders->finalizeMove( item, contentX, contentY );
++  }
+ }
+ 
+ FolderShortcutCommand::FolderShortcutCommand( KMMainWidget *mainwidget,
+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
+@@ -1432,11 +1432,11 @@
+   the_msgIndex = 0;
+ #endif
+ 
+-#if 0
++//#if 0
+   the_weaver =  new KPIM::ThreadWeaver::Weaver( this );
+   the_weaverLogger = new KPIM::ThreadWeaver::WeaverThreadLogger(this);
+   the_weaverLogger->attach (the_weaver);
+-#endif
++//#endif
+ 
+   connect( the_folderMgr, SIGNAL( folderRemoved(KMFolder*) ),
+            this, SIGNAL( folderRemoved(KMFolder*) ) );
diff --git a/kde-base/kmail/kmail-3.5.0-r1.ebuild b/kde-base/kmail/kmail-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..f02ad095458e
--- /dev/null
+++ b/kde-base/kmail/kmail-3.5.0-r1.ebuild
@@ -0,0 +1,57 @@
+# 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 $
+
+KMNAME=kdepim
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE mail client"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
+$(deprange $PV $MAXKDEVER kde-base/libkdepim)
+$(deprange $PV $MAXKDEVER kde-base/libkpimidentities)
+$(deprange $PV $MAXKDEVER kde-base/mimelib)
+$(deprange $PV $MAXKDEVER kde-base/libksieve)
+$(deprange $PV $MAXKDEVER kde-base/certmanager)
+$(deprange $PV $MAXKDEVER kde-base/libkcal)
+$(deprange $PV $MAXKDEVER kde-base/kontact)"
+RDEPEND="${DEPEND}
+$(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves)
+$(deprange $PV $MAXKDEVER kde-base/kmailcvt)
+$(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves)
+$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)" # for the "looknfeel" icon, and probably others.
+
+KMCOPYLIB="
+	libkdepim libkdepim/
+	libkpimidentities libkpimidentities/
+	libmimelib mimelib/
+	libksieve libksieve/
+	libkleopatra certmanager/lib/
+	libkcal libkcal
+	libkpinterfaces kontact/interfaces/
+	libkmime libkmime
+	libkpgp libkpgp"
+KMEXTRACTONLY="
+	libkdenetwork/
+	libkdepim/
+	libkpimidentities/
+	libksieve/
+	libkcal/
+	mimelib/
+	certmanager/
+	korganizer/korganizeriface.h
+	kontact/interfaces/
+	libkmime/
+	libkpgp
+	dcopidlng"
+KMCOMPILEONLY="libemailfunctions"
+# the kmail plugins are installed with kmail
+KMEXTRA="
+	plugins/kmail/
+	kontact/plugins/kmail/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
+
+# Fix crash when applying filters (kde bug 113730). applied for 3.5.1.
+PATCHES="${FILESDIR}/kdepim-3.5.0-filter-crash.patch"