Add kmail patch

5 files changed, 66 insertions, 6 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index eb9afebefa05..adcc1fc4be1d 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 5f1dd8182cf4..54d38dd113b6 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,10 +1,13 @@
 MD5 87f99e9059e596436116e772edba31b1 kdepim-3.1.5.ebuild 800
-MD5 035228000eb155ccb24f0cf148086487 kdepim-3.2.0.ebuild 699
-MD5 bb8e62370b86408792fbf3fdde2df702 kdepim-3.1.4.ebuild 852
-MD5 b8c410ceae08dc7795957b82bcb27ffe ChangeLog 8844
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 bb8e62370b86408792fbf3fdde2df702 kdepim-3.1.4.ebuild 852
+MD5 d38cf87ce9d5dc4ef744f97d4d5c061a ChangeLog 9101
+MD5 035228000eb155ccb24f0cf148086487 kdepim-3.2.0.ebuild 699
 MD5 917d71da75c5eac3a6ef30c8551fc347 kdepim-3.0.5b.ebuild 575
-MD5 10f1253acc1418066ffea529e8818b43 files/digest-kdepim-3.1.4 66
-MD5 0658e29c8e0fa024884f165bf129e8e9 files/digest-kdepim-3.1.5 66
-MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0 66
+MD5 d67315c897f7ca27e88ccb091edf9975 kdepim-3.2.0-r1.ebuild 754
 MD5 d833726815dce86df6d79630ceeecfdc files/digest-kdepim-3.0.5b 67
+MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0 66
+MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0-r1 66
+MD5 0658e29c8e0fa024884f165bf129e8e9 files/digest-kdepim-3.1.5 66
+MD5 bf481282b9583a3e4095dcdef1aee22c files/KMail-inboxEater-BRANCH.diff 1619
+MD5 10f1253acc1418066ffea529e8818b43 files/digest-kdepim-3.1.4 66
diff --git a/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff b/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff
new file mode 100644
index 000000000000..893a2ff82acd
--- /dev/null
+++ b/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff
@@ -0,0 +1,33 @@
+--- kmail/kmfolderimap.cpp    14 Jan 2004 23:05:04 -0000      1.163
++++ kmail/kmfolderimap.cpp    4 Feb 2004 08:53:56 -0000
+@@ -1207,7 +1207,16 @@ void KMFolderImap::deleteMessage(KMMessa
+ {
+   KURL url = mAccount->getUrl();
+   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->parent());
+-  url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID"));
++  QString uid = msg->headerField("X-UID");
++  /* If the uid is empty the delete job below will nuke all mail in the
++     folder, so we better safeguard against that. See ::expungeFolder, as
++     to why. :( */
++  if ( uid.isEmpty() ) {
++     kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete "
++                        "an empty UID. Aborting."  << endl;
++     return;
++  }
++  url.setPath(msg_parent->imapPath() + ";UID=" + uid );
+   if ( mAccount->makeConnection() != ImapAccountBase::Connected )
+     return;
+   KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
+@@ -1228,7 +1237,11 @@ void KMFolderImap::deleteMessage(QPtrLis
+   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.first()->parent());
+   for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it )
+   {
+-    url.setPath(msg_parent->imapPath() + ";UID=" + *it);
++    QString uid = *it;
++    // Don't delete with no uid, that nukes the folder. Should not happen, but
++    // better safe than sorry.
++    if ( uid.isEmpty() ) continue;
++    url.setPath(msg_parent->imapPath() + ";UID=" + uid);
+     if ( mAccount->makeConnection() != ImapAccountBase::Connected )
+       return;
+     KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.0-r1 b/kde-base/kdepim/files/digest-kdepim-3.2.0-r1
new file mode 100644
index 000000000000..7f0b3ccf1635
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.2.0-r1
@@ -0,0 +1 @@
+MD5 657a61e0f3d90d2afec3820e77f81306 kdepim-3.2.0.tar.bz2 7707960
diff --git a/kde-base/kdepim/kdepim-3.2.0-r1.ebuild b/kde-base/kdepim/kdepim-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..cb6807de87ef
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.2.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0-r1.ebuild,v 1.1 2004/02/04 12:02:09 pauldv Exp $
+inherit kde-dist
+
+IUSE="pda crypt ldap"
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+KEYWORDS="~x86 ~sparc ~amd64"
+
+DEPEND="~kde-base/kdenetwork-${PV}
+	pda? ( app-pda/pilot-link dev-libs/libmal )
+	ldap? ( net-nds/openldap )
+	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
+RDEPEND="$DEPEND"
+PATCHES="${FILESDIR}/KMail-inboxEater-BRANCH.diff"
+
+use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
+
+src_install() {
+	kde_src_install
+	docinto html
+	dodoc *.html
+}