Added a patch to restore KMail's mail filtering capabilities. Fixes bug 180244.

Package-Manager: portage-2.1.3_rc7

5 files changed, 271 insertions, 9 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 6c6715380658..354c1c638019 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.274 2007/07/01 13:34:11 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.275 2007/07/10 16:35:11 philantrop Exp $
+
+*kdepim-3.5.7-r2 (10 Jul 2007)
+
+  10 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kmail-3.5.7-filters.patch, +kdepim-3.5.7-r2.ebuild:
+  Added a patch to restore KMail's mail filtering capabilities. Fixes bug 180244.
 
 *kdepim-3.5.7-r1 (01 Jul 2007)
 
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index ed886cde72fd..33892c9a2ec0 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -17,6 +17,10 @@ AUX kmail-3.5.6-templates.patch 875 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a2
 MD5 2921dd25ca635bd565a8e2e9ae8745d4 files/kmail-3.5.6-templates.patch 875
 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 files/kmail-3.5.6-templates.patch 875
 SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe files/kmail-3.5.6-templates.patch 875
+AUX kmail-3.5.7-filters.patch 6793 RMD160 1a4f2331317c332c3779231302db1300ef010259 SHA1 70a44770ff214d814fd8b167ca47733294c22e97 SHA256 e41c85a1b103fe992f7359009e9b10e88a345a8ecd8d62e02e656731d1beb7a9
+MD5 99eac09ec97b86d77fa18388a74fe659 files/kmail-3.5.7-filters.patch 6793
+RMD160 1a4f2331317c332c3779231302db1300ef010259 files/kmail-3.5.7-filters.patch 6793
+SHA256 e41c85a1b103fe992f7359009e9b10e88a345a8ecd8d62e02e656731d1beb7a9 files/kmail-3.5.7-filters.patch 6793
 AUX kmail-utf8.diff 588 RMD160 d0ea21d1d794ddd2ddf382ac47176a2db4471d98 SHA1 5fcdad4ab0473a9be8a18d56060b830651112460 SHA256 cc875741040d45c7a76eeae230e7bb6270970f2df7a41ed14b0854a601f68e72
 MD5 e3c7f18014de49d1fb5b6f54ef9366a3 files/kmail-utf8.diff 588
 RMD160 d0ea21d1d794ddd2ddf382ac47176a2db4471d98 files/kmail-utf8.diff 588
@@ -62,14 +66,18 @@ EBUILD kdepim-3.5.7-r1.ebuild 1842 RMD160 1e386eadb8efc438b9a2e9a88443d66c1af844
 MD5 503a5c352f6f695f41273f19f0ef52dd kdepim-3.5.7-r1.ebuild 1842
 RMD160 1e386eadb8efc438b9a2e9a88443d66c1af8447a kdepim-3.5.7-r1.ebuild 1842
 SHA256 36d730acb97a2a089e48c02203f9e1b9173140e09cb238b99c8b81068e9f1e82 kdepim-3.5.7-r1.ebuild 1842
+EBUILD kdepim-3.5.7-r2.ebuild 1882 RMD160 fd93d1a8630b80cd6ee7480b1f226839a27e5ae0 SHA1 ed3f4731cb2de2f32f32d0590a43d90f7c0d6bd0 SHA256 e77394b5d3a46803adb757f9849ab57b8e39ff37df7608a63f99a958d5465748
+MD5 19cfe9b0568d12ff7b14e7e4675d6252 kdepim-3.5.7-r2.ebuild 1882
+RMD160 fd93d1a8630b80cd6ee7480b1f226839a27e5ae0 kdepim-3.5.7-r2.ebuild 1882
+SHA256 e77394b5d3a46803adb757f9849ab57b8e39ff37df7608a63f99a958d5465748 kdepim-3.5.7-r2.ebuild 1882
 EBUILD kdepim-3.5.7.ebuild 1783 RMD160 9d2984111a73df7fe449dd347b8456c2f0ab375d SHA1 4492ccb4a504bfb3a925ea67abf0bde22c29ffc4 SHA256 3c9defe0d89e8875a928f40ba0b6e72f0e260da41c901a65b901944df408d90a
 MD5 1151c9700bf8739b4dc46c83dc2c67e2 kdepim-3.5.7.ebuild 1783
 RMD160 9d2984111a73df7fe449dd347b8456c2f0ab375d kdepim-3.5.7.ebuild 1783
 SHA256 3c9defe0d89e8875a928f40ba0b6e72f0e260da41c901a65b901944df408d90a kdepim-3.5.7.ebuild 1783
-MISC ChangeLog 37393 RMD160 35211ce3bb0a785b4b3dc63ecf55d890f1474dc2 SHA1 9a5ff49c712848d33e713cc206981d610f558270 SHA256 ffb6dbdb062ba00e66c4fc27b5d3f1f048725e451973f3c207a544b5b6640715
-MD5 e63cfce1c0bed6f940c035a1a584118e ChangeLog 37393
-RMD160 35211ce3bb0a785b4b3dc63ecf55d890f1474dc2 ChangeLog 37393
-SHA256 ffb6dbdb062ba00e66c4fc27b5d3f1f048725e451973f3c207a544b5b6640715 ChangeLog 37393
+MISC ChangeLog 37624 RMD160 11bba5541220b1249d444036a7565a05e4cc8615 SHA1 bdd8921db027ed788142ca423930958e680a51c1 SHA256 80c17b96bc29282655a5f7f726dcb1888b4375477fc4a2577e18e1464801db9e
+MD5 6710bbb78229623ce1540e918582ce69 ChangeLog 37624
+RMD160 11bba5541220b1249d444036a7565a05e4cc8615 ChangeLog 37624
+SHA256 80c17b96bc29282655a5f7f726dcb1888b4375477fc4a2577e18e1464801db9e ChangeLog 37624
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -98,10 +106,13 @@ SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/di
 MD5 7f2693c97c9b5efc543db636b6430308 files/digest-kdepim-3.5.7-r1 247
 RMD160 969f30b74378c53d0e07ac66364c0e0ed700b9a9 files/digest-kdepim-3.5.7-r1 247
 SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/digest-kdepim-3.5.7-r1 247
+MD5 7f2693c97c9b5efc543db636b6430308 files/digest-kdepim-3.5.7-r2 247
+RMD160 969f30b74378c53d0e07ac66364c0e0ed700b9a9 files/digest-kdepim-3.5.7-r2 247
+SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/digest-kdepim-3.5.7-r2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGh61bCkvF58q80IkRAvIBAJsFGSiDOwkAY1VKpuM8fEyQd6RBsQCglAUK
-NGmqB9pAZLlplGKWBaYr7YY=
-=eRSj
+iD8DBQFGk7VKCkvF58q80IkRAh3fAKChtzsWwJdgAvhsxDfFRewP7AI5VQCgnQu3
+Tv+2N+c8+K19NThZvDoSiIk=
+=njcR
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.7-r2 b/kde-base/kdepim/files/digest-kdepim-3.5.7-r2
new file mode 100644
index 000000000000..01737c61da89
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.5.7-r2
@@ -0,0 +1,3 @@
+MD5 8571db6dcf4168614c96bb72c493f931 kdepim-3.5.7.tar.bz2 14166061
+RMD160 14c05d4620abf1eb5421ad434dc63f037069e930 kdepim-3.5.7.tar.bz2 14166061
+SHA256 9d981d372f1822662e102b6f84f046e4df771641fc4d041aae81b8fafd47b32e kdepim-3.5.7.tar.bz2 14166061
diff --git a/kde-base/kdepim/files/kmail-3.5.7-filters.patch b/kde-base/kdepim/files/kmail-3.5.7-filters.patch
new file mode 100644
index 000000000000..d808de614149
--- /dev/null
+++ b/kde-base/kdepim/files/kmail-3.5.7-filters.patch
@@ -0,0 +1,186 @@
+diff -Naur kmail-3.5.7.orig/kmail/folderstorage.cpp kmail-3.5.7/kmail/folderstorage.cpp
+--- kmail-3.5.7.orig/kmail/folderstorage.cpp	2007-05-14 09:54:39.000000000 +0200
++++ kmail-3.5.7/kmail/folderstorage.cpp	2007-07-09 23:01:26.000000000 +0200
+@@ -84,8 +84,6 @@
+ 
+   mHasChildren = HasNoChildren;
+   mContentsType = KMail::ContentsTypeMail;
+- 
+-  connect(this, SIGNAL(closed(KMFolder*)), mFolder, SIGNAL(closed()));  
+ }
+ 
+ //-----------------------------------------------------------------------------
+@@ -629,7 +627,7 @@
+   QString oldLoc, oldIndexLoc, oldIdsLoc, newLoc, newIndexLoc, newIdsLoc;
+   QString oldSubDirLoc, newSubDirLoc;
+   QString oldName;
+-  int rc=0;
++  int rc=0, openCount=mOpenCount;
+   KMFolderDir *oldParent;
+ 
+   assert(!newName.isEmpty());
+@@ -699,6 +697,11 @@
+     }
+   }
+ 
++  if (openCount > 0)
++  {
++    open("rename");
++    mOpenCount = openCount;
++  }
+   writeConfig();
+ 
+   // delete the old entry as we get two entries with the same ID otherwise
+@@ -708,7 +711,6 @@
+   emit locationChanged( oldLoc, newLoc );
+   emit nameChanged();
+   kmkernel->folderMgr()->contentsChanged();
+-  emit closed(folder()); // let the ticket owners regain
+   return rc;
+ }
+ 
+@@ -736,7 +738,6 @@
+   KConfig* config = KMKernel::config();
+   config->deleteGroup( "Folder-" + folder()->idString() );
+ 
+-  emit closed(folder());
+   emit removed(folder(), (rc ? false : true));
+ }
+ 
+@@ -744,6 +745,8 @@
+ //-----------------------------------------------------------------------------
+ int FolderStorage::expunge()
+ {
++  int openCount = mOpenCount;
++
+   assert(!folder()->name().isEmpty());
+ 
+   clearIndex( true, mExportsSernums );   // delete and remove from dict, if needed
+@@ -761,6 +764,12 @@
+   mDirty = false;
+   needsCompact = false; //we're cleared and truncated no need to compact
+ 
++  if (openCount > 0)
++  {
++    open("expunge");
++    mOpenCount = openCount;
++  }
++
+   mUnreadMsgs = 0;
+   mTotalMsgs = 0;
+   emit numUnreadMsgsChanged( folder() );
+diff -Naur kmail-3.5.7.orig/kmail/folderstorage.h kmail-3.5.7/kmail/folderstorage.h
+--- kmail-3.5.7.orig/kmail/folderstorage.h	2007-05-14 09:54:39.000000000 +0200
++++ kmail-3.5.7/kmail/folderstorage.h	2007-07-09 23:01:26.000000000 +0200
+@@ -418,9 +418,6 @@
+       emmitted first. */
+   void expunged( KMFolder* );
+ 
+-  /** Emitted when the folder was closed and ticket owners have to reopen */
+-  void closed( KMFolder* );
+-  
+   /** Emitted when the serial numbers of this folder were invalidated. */
+   void invalidated( KMFolder * );
+ 
+diff -Naur kmail-3.5.7.orig/kmail/kmfolder.cpp kmail-3.5.7/kmail/kmfolder.cpp
+--- kmail-3.5.7.orig/kmail/kmfolder.cpp	2007-05-14 09:54:39.000000000 +0200
++++ kmail-3.5.7/kmail/kmfolder.cpp	2007-07-09 23:01:26.000000000 +0200
+@@ -476,7 +476,6 @@
+ 
+ void KMFolder::close( const char *owner, bool force )
+ {
+-  // do not emit closed() in here - as this would regain too early
+   mStorage->close( owner, force );
+ }
+ 
+diff -Naur kmail-3.5.7.orig/kmail/kmfolder.h kmail-3.5.7/kmail/kmfolder.h
+--- kmail-3.5.7.orig/kmail/kmfolder.h	2007-05-14 09:54:39.000000000 +0200
++++ kmail-3.5.7/kmail/kmfolder.h	2007-07-09 23:01:26.000000000 +0200
+@@ -537,10 +537,6 @@
+     folder changed. */
+   void changed();
+ 
+-  /** Emitted when the folder is closed for real - ticket holders should
+-   * discard any messages */
+-  void closed();
+-
+   /** Emitted when the contents of a folder have been cleared
+      (new search in a search folder, for example) */
+   void cleared();
+diff -Naur kmail-3.5.7.orig/kmail/kmfoldermbox.cpp kmail-3.5.7/kmail/kmfoldermbox.cpp
+--- kmail-3.5.7.orig/kmail/kmfoldermbox.cpp	2007-05-14 09:54:39.000000000 +0200
++++ kmail-3.5.7/kmail/kmfoldermbox.cpp	2007-07-09 23:01:26.000000000 +0200
+@@ -264,7 +264,7 @@
+   if (mOpenCount <= 0 || !mStream) { mOpenCount = 0; return; }
+   if (mOpenCount > 0) mOpenCount--;
+   if (mOpenCount > 0 && !aForced) { assert(mStream); return; }
+-
++  
+ #if 0 // removed hack that prevented closing system folders (see kmail-devel discussion about mail expiring)
+   if ( (folder() != kmkernel->inboxFolder())
+         && folder()->isSystemFolder() && !aForced )
+@@ -1246,11 +1246,17 @@
+ {
+   // This is called only when the user explicitely requests compaction,
+   // so we don't check needsCompact.
++  int openCount = mOpenCount;
+ 
+   KMail::MboxCompactionJob* job = new KMail::MboxCompactionJob( folder(), true /*immediate*/ );
+   int rc = job->executeNow( silent );
+   // Note that job autodeletes itself.
+ 
++  if (openCount > 0)
++  {
++    open("mboxcompact");
++    mOpenCount = openCount;
++  }
+   // If this is the current folder, the changed signal will ultimately call
+   // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
+   QString statusMsg = BroadcastStatus::instance()->statusMsg();
+diff -Naur kmail-3.5.7.orig/kmail/kmheaders.cpp kmail-3.5.7/kmail/kmheaders.cpp
+--- kmail-3.5.7.orig/kmail/kmheaders.cpp	2007-05-14 09:54:39.000000000 +0200
++++ kmail-3.5.7/kmail/kmheaders.cpp	2007-07-09 23:01:26.000000000 +0200
+@@ -673,8 +673,6 @@
+                  this, SLOT(folderCleared()));
+       disconnect(mFolder, SIGNAL(expunged( KMFolder* )),
+                  this, SLOT(folderCleared()));
+-      disconnect(mFolder, SIGNAL(closed()),
+-                 this, SLOT(folderClosed()));
+       disconnect( mFolder, SIGNAL( statusMsg( const QString& ) ),
+                   BroadcastStatus::instance(), SLOT( setStatusMsg( const QString& ) ) );
+       disconnect(mFolder, SIGNAL(viewConfigChanged()), this, SLOT(reset()));
+@@ -708,8 +706,6 @@
+               this, SLOT(folderCleared()));
+       connect(mFolder, SIGNAL(expunged( KMFolder* )),
+                  this, SLOT(folderCleared()));
+-      connect(mFolder, SIGNAL(closed()),
+-                 this, SLOT(folderClosed()));
+       connect(mFolder, SIGNAL(statusMsg(const QString&)),
+               BroadcastStatus::instance(), SLOT( setStatusMsg( const QString& ) ) );
+       connect(mFolder, SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+@@ -2565,13 +2561,6 @@
+     emit selected(0);
+ }
+ 
+-
+-void KMHeaders::folderClosed()
+-{
+-    mFolder->open( "kmheaders" );
+-    folderCleared();
+-}
+-
+ bool KMHeaders::writeSortOrder()
+ {
+   QString sortFile = KMAIL_SORT_FILE(mFolder);
+diff -Naur kmail-3.5.7.orig/kmail/kmheaders.h kmail-3.5.7/kmail/kmheaders.h
+--- kmail-3.5.7.orig/kmail/kmheaders.h	2007-05-14 09:54:39.000000000 +0200
++++ kmail-3.5.7/kmail/kmheaders.h	2007-07-09 23:01:26.000000000 +0200
+@@ -221,8 +221,6 @@
+   void msgChanged();
+   /** For when the folder has been cleared */
+   void folderCleared();
+-  /** For when the folder has been cleared */
+-  void folderClosed();
+   /** For when the message with the given message id has been added to a folder */
+   void msgAdded(int);
+   /** For when the message with the given id has been removed for a folder */
diff --git a/kde-base/kdepim/kdepim-3.5.7-r2.ebuild b/kde-base/kdepim/kdepim-3.5.7-r2.ebuild
new file mode 100644
index 000000000000..a9c5aefdf650
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.5.7-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.7-r2.ebuild,v 1.1 2007/07/10 16:35:11 philantrop Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE PIM (Personal Information Management) applications: KOrganizer, KMail, KNode,..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt gnokii"
+
+RESTRICT="test"
+
+# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
+DEPEND="~kde-base/kdebase-${PV}
+	>=dev-libs/cyrus-sasl-2
+	gnokii? ( app-mobilephone/gnokii )
+	crypt? ( >=app-crypt/gpgme-1.1.2-r1
+		|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
+		x11-libs/libXScrnSaver
+	app-pda/libopensync"
+#	Requires pilot-link-0.12.0
+#	pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )
+
+RDEPEND="${DEPEND}
+	crypt? ( app-crypt/pinentry )"
+
+DEPEND="${DEPEND}
+	x11-proto/scrnsaverproto"
+
+PATCHES="${FILESDIR}/akregator-3.5.7-customcolors.diff
+		${FILESDIR}/kmail-3.5.7-filters.patch"
+
+src_unpack() {
+	kde_src_unpack
+	# Call Qt 3 designer
+	sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
+
+	# disabling tests, see bug #164038 and bug #164097
+	sed -e "s:SUBDIRS = libical versit tests:SUBDIRS = libical versit:" \
+		-i libkcal/Makefile.am || die "sed failed" || die "sed failed"
+# 	sed -e "s:SUBDIRS = . plugins test:SUBDIRS = . plugins:" \
+# 		-i kitchensync/libkonnector2/Makefile.am || die "sed failed"
+# 	sed -e "s:SUBDIRS = . tests test:SUBDIRS = .:" \
+# 		-i kitchensync/libksync/Makefile.am || die "sed failed"
+}
+
+src_compile() {
+	local myconf="--with-sasl $(use_with gnokii)"
+	use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
+
+	# use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+	DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+
+	kde_src_compile
+}