Add patch for duplicated inbox/sent-mail folders after kmail 1->2 migration, kde bug 283467.

(Portage version: 2.2.0_alpha61/cvs/Linux x86_64)

3 files changed, 118 insertions, 1 deletions

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index d848ddb80615..d7c16db23f4d 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.49 2011/10/06 18:10:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.50 2011/10/07 22:05:28 reavertm Exp $
+
+*kdepim-runtime-4.7.2-r1 (07 Oct 2011)
+
+  07 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  +kdepim-runtime-4.7.2-r1.ebuild,
+  +files/kdepim-runtime-4.7.2-duplicated-folders.patch:
+  Add patch for duplicated inbox/sent-mail folders after kmail 1->2 migration,
+  kde bug 283467.
 
 *kdepim-runtime-4.7.2 (06 Oct 2011)
 
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch
new file mode 100644
index 000000000000..d85d813e8af5
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch
@@ -0,0 +1,75 @@
+commit 6bdc6290632be5fc6c103064463d7421b5e3b60d
+Author: Montel Laurent <montel@kde.org>
+Date:   Fri Oct 7 17:14:06 2011 +0200
+
+    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
+
+diff --git a/migration/kmail/localfolderscollectionmigrator.cpp b/migration/kmail/localfolderscollectionmigrator.cpp
+index 3edc59e..ea9f163 100644
+--- a/migration/kmail/localfolderscollectionmigrator.cpp
++++ b/migration/kmail/localfolderscollectionmigrator.cpp
+@@ -64,23 +64,41 @@ void LocalFoldersCollectionMigrator::setKMailConfig( const KSharedConfigPtr &con
+ 
+   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-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild
new file mode 100644
index 000000000000..64b403eb2d14
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild,v 1.1 2011/10/07 22:05:28 reavertm Exp $
+
+EAPI=4
+
+KMNAME="kdepim-runtime"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+	app-misc/strigi
+	>=app-office/akonadi-server-1.3.60
+	dev-libs/boost
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-libs/shared-desktop-ontologies-0.6.51
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-icons)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-duplicated-folders.patch"
+)