6 files changed, 147 insertions, 0 deletions
diff --git a/kde/patch/kdepim-runtime.patch b/kde/patch/kdepim-runtime.patch
new file mode 100644
index 0000000..0fa7a5a
--- /dev/null
+++ b/kde/patch/kdepim-runtime.patch
@@ -0,0 +1,7 @@
+# Fix a bug in kdepim-runtime 4.7.1 which can cause an email to be permanently
+# lost when downloading from a POP3 account into a maildir-style mailbox:
+#cat $CWD/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Address bug 283467, fixed in KDE 4.7.3:
+#cat $CWD/patch/kdepim-runtime/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch b/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch
new file mode 100644
index 0000000..2a8397d
--- /dev/null
+++ b/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch
@@ -0,0 +1,36 @@
+From ccd67f3e65c9ffe32858ca521aa1e56a42b026af Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Tue, 20 Sep 2011 10:12:40 +0200
+Subject: [PATCH] Ignore items with empty remote ids here.
+
+Items with empty remote id are those not yet stored by the resource,
+ie. we still have pending change replays for those. So, if we do a sync
+during that period (which could happen since the introduction of the
+file system watcher), we would remove a random one of those (only one
+since the map would only contain one without a remote id). This mostly
+affects the POP3 usage pattern.
+(cherry picked from commit f814b46a799ea8418ae17cf77d44da473124d12d)
+---
+ resources/maildir/retrieveitemsjob.cpp |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/resources/maildir/retrieveitemsjob.cpp b/resources/maildir/retrieveitemsjob.cpp
+index 7253f7e..f0273ef 100644
+--- a/resources/maildir/retrieveitemsjob.cpp
++++ b/resources/maildir/retrieveitemsjob.cpp
+@@ -57,8 +57,10 @@ void RetrieveItemsJob::localListDone ( KJob* job )
+ 
+   const Akonadi::Item::List items = qobject_cast<Akonadi::ItemFetchJob*>( job )->items();
+   m_localItems.reserve( items.size() );
+-  foreach ( const Akonadi::Item &item, items )
+-    m_localItems.insert( item.remoteId(), item );
++  foreach ( const Akonadi::Item &item, items ) {
++    if ( !item.remoteId().isEmpty() )
++      m_localItems.insert( item.remoteId(), item );
++  }
+ 
+   const QStringList entryList = m_maildir.entryList();
+   qint64 previousMtime = m_collection.remoteRevision().toLongLong();
+-- 
+1.7.1
+
diff --git a/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch b/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch
new file mode 100644
index 0000000..1c1dcc5
--- /dev/null
+++ b/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch
@@ -0,0 +1,76 @@
+From: Montel Laurent <montel@kde.org>
+Date: Fri, 07 Oct 2011 15:14:06 +0000
+Subject: Fix Bug 283467 - Kmail has duplicated folders after migration from previous version.
+X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&amp;a=commitdiff&amp;h=6bdc6290632be5fc6c103064463d7421b5e3b60d
+---
+Fix Bug 283467 - Kmail has duplicated folders after migration from previous version.
+
+By default in config we don't translate config name.
+We use "inbox" "sent-mail" etc.
+
+BUG: 283467
+FIXED-IN: 4.7.3
+---
+
+
+--- a/migration/kmail/localfolderscollectionmigrator.cpp
++++ b/migration/kmail/localfolderscollectionmigrator.cpp
+@@ -64,23 +64,41 @@ void LocalFoldersCollectionMigrator::set
+ 
+   const KConfigGroup group( config, QLatin1String( "General" ) );
+ 
+-  QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox",  "inbox" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
+-
+-  name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox",  "outbox" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
+-
+-  name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail",  "sent-mail" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
+-
+-  name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash",  "trash" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
+-
+-  name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts",  "drafts" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
+-
+-  name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates",  "templates" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
++  if ( group.hasKey( QLatin1String( "inboxFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox",  "inbox" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "inbox" ), SpecialMailCollections::Inbox );
++
++  if ( group.hasKey( QLatin1String( "outboxFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox",  "outbox" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "outbox" ), SpecialMailCollections::Outbox );
++
++  if ( group.hasKey( QLatin1String( "sentFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail",  "sent-mail" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "sent-mail" ), SpecialMailCollections::SentMail );
++
++  if ( group.hasKey( QLatin1String( "trashFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash",  "trash" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "trash" ), SpecialMailCollections::Trash );
++
++  if ( group.hasKey( QLatin1String( "draftsFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts",  "drafts" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "drafts" ), SpecialMailCollections::Drafts );
++
++  if ( group.hasKey( QLatin1String( "templatesFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates",  "templates" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
++  } else
++    d->mSystemFolders.insert( QLatin1String( "templates" ), SpecialMailCollections::Templates );
+ }
+ 
+ void LocalFoldersCollectionMigrator::migrateCollection( const Collection &collection, const QString &folderId )
diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch
new file mode 100644
index 0000000..b36c707
--- /dev/null
+++ b/kde/patch/kdepim.patch
@@ -0,0 +1,6 @@
+# Install the kleopatra headers, or else kopete-cryptography will not build:
+cat $CWD/patch/kdepim/kdepim-4.5.85-install-headers.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix a memleak in kdepim 4.7.1 (fixed just too late to be included in the
+# 4.7.1 tarball)
+#cat $CWD/patch/kdepim/kdepim-4.7.1_memleak.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/kdepim/kdepim-4.5.85-install-headers.patch b/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch
index aa43059..aa43059 100644
--- a/kde/kdepim/kdepim-4.5.85-install-headers.patch
+++ b/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch
diff --git a/kde/patch/kdepim/kdepim-4.7.1_memleak.patch b/kde/patch/kdepim/kdepim-4.7.1_memleak.patch
new file mode 100644
index 0000000..e959dfa
--- /dev/null
+++ b/kde/patch/kdepim/kdepim-4.7.1_memleak.patch
@@ -0,0 +1,22 @@
+commit 0dbc5c1b233d355dce26868253c0e8f4dede58d4
+Author: Montel Laurent <montel@kde.org>
+Date:   Mon Sep 5 16:01:10 2011 +0200
+
+    Fix mem leak (too bad it will not in 4.7.1)
+
+diff --git a/mailcommon/foldercollection.cpp b/mailcommon/foldercollection.cpp
+index 3c31d8e..2d4ca73 100644
+--- a/mailcommon/foldercollection.cpp
++++ b/mailcommon/foldercollection.cpp
+@@ -294,8 +294,10 @@ uint FolderCollection::identity() const
+     OrgKdeAkonadiImapSettingsInterface *imapSettingsInterface = Util::createImapSettingsInterface( mCollection.resource() );
+     if ( imapSettingsInterface->isValid() ) {
+       QDBusReply<bool> useDefault = imapSettingsInterface->useDefaultIdentity();
+-      if( useDefault.isValid() && useDefault.value() )
++      if( useDefault.isValid() && useDefault.value() ) {
++	delete imapSettingsInterface;
+         return mIdentity;
++      }
+ 
+        QDBusReply<int> remoteAccountIdent = imapSettingsInterface->accountIdentity();
+       if ( remoteAccountIdent.isValid() && remoteAccountIdent.value() > 0 ) {