Backport fix for kde bug 323762

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x94BFDF4484AD142F

4 files changed, 159 insertions, 8 deletions

diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index 5195230292b5..9aa9d63561b9 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.223 2013/10/10 03:56:21 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.224 2013/10/30 16:55:22 dilfridge Exp $
+
+*kdepimlibs-4.11.2-r2 (30 Oct 2013)
+
+  30 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/kdepimlibs-4.11.2-sentuuid.patch, +kdepimlibs-4.11.2-r2.ebuild:
+  Backport fix for kde bug 323762
 
   10 Oct 2013; Chris Reffett <creffett@gentoo.org>
   files/kdepimlibs-4.9.1-boostincludes.patch:
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index b86952188b76..aa99d1bad71a 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kdepimlibs-4.11.2-sentuuid.patch 3143 SHA256 ca50b5c3b7eec9148187bc15fb5c82b2c7bd69e871376b6524c9c5a4ef697a0d SHA512 90c527e7b588e7b179c6c790caac9311ac0385ab2691718f2f8b1c3f9c43497e76fb53d4b195c2c07b75350299ba7c41655e34603fb4328368f80ea374921a56 WHIRLPOOL d9b0e2ab58a3ff1ea0cad6b11be6ee8e617bb480f48fed702022d32e6fd2548e13c93e5ec924e4a7c221901fca4d9042b1d5a19640bcbdbf827b5aa033515b33
 AUX kdepimlibs-4.9.1-boostincludes.patch 934 SHA256 2c4659c63b231662c3b6cae1205e46d9214240616f0c47591cf63a147a25f610 SHA512 61066f97d1fd2906bb96e4dc26dfa9aa2d758b5bea4198af5775c488c7390b17e77214d1ce1371587e4fb1c608b905bbaab0d3daf1b99de968e720a00bdac10f WHIRLPOOL cbc8de75304342ef2c6ae3956ae670975e42dfaeedd4c48bb23928edfd86f5638dd629a2487aefa1fd9fc92905aa4b65f42a99ab207d227ba42c9976ab7ee8b9
 DIST kdepimlibs-4.10.5.tar.xz 2986664 SHA256 b9600f2ae1c61d65252ac5046c348f18d586114be3ab54744b0f5925f2881e06 SHA512 5f73a50c35eb62b62cd2a3e26651c1f90ef82984787b3a037a9f2bd356f2ea3043d6d59fe3c0ea03e96c0ad996c481f767876f27a0275c7247686f598f531619 WHIRLPOOL 18ba9e1c14db2103d06d883f7576edf2111efbeefe6cc07e458b7d79cf7dbdb2523b57120587b4788f047d734b8d826d9e84e8956ed96cc7ea8f2bc61a83670a
 DIST kdepimlibs-4.11.2.tar.xz 3022144 SHA256 87bac1c49018222b433073cd26412778edc1a527bef272d8a85bf193e867b64f SHA512 6f5cc7e5dbc3931af7f597ab300e62b2409832f3abe97be3393367c38cb47706332f1f87baba8f07d0559a6030caeb370f2b4bb72a4a7844deba09a38de9a140 WHIRLPOOL 97d9c3e9d939a2947ff6d8dd91a395b8002442cc69accee40ffa68e3fb22a8d42b14fe16e8fc2a2afd8405221d6724a33a18555c73e1328f2e3a7dec87463697
 EBUILD kdepimlibs-4.10.5.ebuild 2467 SHA256 6bde8f6968eac6d37c815d4facf3d72f2bf73c3e8dcbb65e412ae43587a7954a SHA512 b4072452f1e5349f3e33917c11c41f17d6f31a7ed87f2f2cf9f2b7044600fb7a019ad54cce17932cf187dd0b660843dff70dc9469b377621f4728e0b52500d31 WHIRLPOOL 0f83feb07747ba5a859691c20362de7240587c1abd85b6adf907c36d3db3b98b31723e89c5dafdda30ad46911ed4cab1f46e9467374bf2a19be94818a31be3a0
 EBUILD kdepimlibs-4.11.2-r1.ebuild 1518 SHA256 b930381567be893ebbf272f86f9700d858a2de104744244e6ed4469ff712bc29 SHA512 8603de831e4468cc4a94f8e1757bc63c57f641df402c474c43599e2d3bf139503e1151db781fe087854d370bbbea0ffcaf0f4082efbba2a85751474c0231db4e WHIRLPOOL 7383998dc27801ae003c991b7671a1292ff84ec805471ae0e5437e1ab205da2820af0ee3848f48efa77ee81d664ae372ee82aeb5f5ab0af035e5fd440304bf21
-MISC ChangeLog 28640 SHA256 e0528e0dc32394267d9f88fbbfddbc72e9820e4d791a60ec01afef0a382a028e SHA512 d8a97b66737fc9d431d2dd6ecf0ee3ff519b230f287dbfb324fd69840df5de112e55396f765656ae6895e8d3aeeded5d446a366e24b9e10793ccfb40cff909d8 WHIRLPOOL fc9871a11ce1e9cbe0fd194344bf262c42b47d9bb107aece51deb3d9e88ba56015af85303065abce78c6c23716040006d2c1255760460f8c5596583f852bee47
+EBUILD kdepimlibs-4.11.2-r2.ebuild 1563 SHA256 2483736cf728cd2c5ba3b2dd53ef57cacbd745de6ca8144e493c0403eea47438 SHA512 9500fb72c60ac24c88d4c04cb7d543d78c69ecef4c8c0a8950b0ad506cf6b841b3ec288bd3ae5633cb3f4425ff7dd06e37ab3027108ebeeab5f829085ee3fc3b WHIRLPOOL b17135d7128c9a165644539216627cc3b6e8e31e0d15bb8c2e05123583f5b50619a9ca2c98eaa29db6c4af25e174d77ddaf671ff0b92ca9f46eabb0a024e8506
+MISC ChangeLog 28843 SHA256 56f9cedd6c25eb6fd67067f34562f8f7dafc55638a570a9b71b398d7e0e26051 SHA512 5ca53357237aa2518cbd80b9ef3ca317bae3ae92d87f22cf9831f139d68702a3e5cd15a68d4f792ad2b695d2e0b18ad5a1c0e6d0a5dd5ffc8141c00df6ad1338 WHIRLPOOL 255ce0c1d894a6d4097d3676ad0ccd90737b2d372d6654620de84c1bb290e64a617197ecea64a561ca72753a1c31ba58724662a8e39e352cda942661b6243f76
 MISC metadata.xml 240 SHA256 03a8b64042d6629d65428d94ce09d848c1f6346abf57819562485dfe2759c9e1 SHA512 f4485bd63199f8fdba6ca707fe59557e26c3ad859f291a42d19708f475e9a5f174b8f9823f31c1ac21e147f5fec1d5489a8785dcee2d8fd88e5272ac80cfe564 WHIRLPOOL d82da2bbbbc6a288e141eda054db6800b8602e98197e67daf442f44daac191eb47f04a0b64d67dc95d0b4017ee006f76e5890c25843701158b2e70f39c9bffb8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iKYEAREIAGYFAlJWOqVfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1THBACfbD4qS763p2DM3rpT/HptGPpV
-8HcAmwZLs9JoubRpk/HcqYh3jGeXzQBg
-=gsOS
+iQJ8BAEBCABmBQJScTm6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5
+NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQvBhcP/idXJ/GO058cG/0Qsgb6RG/U
+ag0SN1ndD+z073TbpmM+zzJFqx706SRAXlKJxAtmKnnNfqjkZ+MWzeo7Cc4oQOBU
+ZKS8XIpl8AdNoq4I8k/vwsfhmNy1miIS9BR0xlx6qX4TcLRjR5QQnnxZsRaODYl8
+mdzqh0nO5UTTU3u/sNPg3f2dWyqNVCmuu++CI1FiLT28ts+b2GR7XIGB2g7SHazL
+87ifcPaqAq7dO6lNaLsxLdyV17rV5F6c0djFdiHgSOrlAK9BzcmnoVMMXt249dOq
+0UBJs898SM3oVntRQHvlfkp24yzU5zGV/Y8CQQT0OkDZMQkO5wCcxx3aN851vd/q
+bDj6Co/Sxo5f28lBJ5+m0ezuSEvqwq/+MT1c3HfvpK2GORbAUDp8vtgtAQJ6jaLw
+uQKPnnL7ZEbW66MjU5eMTLDyAUzwc6BZsj2nNBuOKKoGMEzhIUsIoA5+hjXxQyJE
+mbpUHr4fFFc+jW4sS3JYCoQTzOH88LwCT829LTctdQRD3XcLZc8f/gT6dHcQOmv4
+Hh5NFDMvtSsQWBZSOVGkHa6wDnoFZSK5MajCYbX5EAoD0IKQd2qSz4v2IgMg5zd+
+Tzo2nE00L10ZLtym8lrAWqn5nGKOOQkZWAz/ojPgsaBkkDEbUIE3oWI+wMr//okB
+ISLpey63HVKB7wBQbhJn
+=jZ1q
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.11.2-sentuuid.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.11.2-sentuuid.patch
new file mode 100644
index 000000000000..b7b6beaf3440
--- /dev/null
+++ b/kde-base/kdepimlibs/files/kdepimlibs-4.11.2-sentuuid.patch
@@ -0,0 +1,75 @@
+From 498d6678f478bd1bd9bdc944bb790f6b16b7ade4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
+Date: Wed, 30 Oct 2013 16:46:45 +0100
+Subject: [PATCH] Wait for changes from resource to be written to Akonadi
+ before marking change as processed
+
+This fixes a problem with invalid RIDs after inter-resource moves.
+When there is an another changeReplay for the just moved item
+scheduled in the new parent resource, the item will have invalid RID
+(or rather RID assigned to it by the previous parent resource).
+It's because the ItemModifyJob dispatched from ResourceBase::changesCommitted()
+with the new RID is not finished yet when the next task is dispatched,
+and so the item in resource's EntityCache is not invalidated
+and the resource will use it instead of the updated one.
+
+By waiting for the ItemModifyJob dispatched from changesCommited()
+to finish before marking the change as processed and dispatching
+next task we make sure that in case the next task involves the
+same item the change will be stored in Akonadi and the item will
+be invalidated in local caches, forcing the resource to fetch the
+item again from Akonadi before starting the task.
+
+This fixes 'Invalid uidset' error reported by IMAP resources after
+the MailDispatcher agent moves the mail from local Outbox to remote
+Sent folder and updates it's flags.
+
+BUG: 323762
+BUG: 324807
+CCBUG: 314964
+FIXED-IN: 4.11.3
+---
+ akonadi/resourcebase.cpp | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/akonadi/resourcebase.cpp b/akonadi/resourcebase.cpp
+index 70c8286..2383ba0 100644
+--- a/akonadi/resourcebase.cpp
++++ b/akonadi/resourcebase.cpp
+@@ -670,12 +670,11 @@ void ResourceBase::changeCommitted( const Item& item )
+ 
+ void ResourceBase::changesCommitted(const Item::List& items)
+ {
+-  Q_D( ResourceBase );
+   ItemModifyJob *job = new ItemModifyJob( items );
+   job->d_func()->setClean();
+   job->disableRevisionCheck(); // TODO: remove, but where/how do we handle the error?
+   job->setIgnorePayload( true ); // we only want to reset the dirty flag and update the remote id
+-  d->changeProcessed();
++  connect( job, SIGNAL(finished(KJob*)), this, SLOT(changeCommittedResult(KJob*)) );
+ }
+ 
+ void ResourceBase::changeCommitted( const Collection &collection )
+@@ -687,9 +686,16 @@ void ResourceBase::changeCommitted( const Collection &collection )
+ void ResourceBasePrivate::changeCommittedResult( KJob *job )
+ {
+   Q_Q( ResourceBase );
+-  if ( job->error() )
+-    emit q->error( i18nc( "@info", "Updating local collection failed: %1.", job->errorText() ) );
+-  mChangeRecorder->d_ptr->invalidateCache( static_cast<CollectionModifyJob*>( job )->collection() );
++  if ( qobject_cast<CollectionModifyJob*>( job ) ) {
++    if ( job->error() ) {
++      emit q->error( i18nc( "@info", "Updating local collection failed: %1.", job->errorText() ) );
++    }
++    mChangeRecorder->d_ptr->invalidateCache( static_cast<CollectionModifyJob*>( job )->collection() );
++  } else {
++    // TODO: Error handling for item changes?
++    // Item cache is invalidated by ItemModifyJob
++  }
++
+   changeProcessed();
+ }
+ 
+-- 
+1.8.3.2
+
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.11.2-r2.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.11.2-r2.ebuild
new file mode 100644
index 000000000000..0ced674a1350
--- /dev/null
+++ b/kde-base/kdepimlibs/kdepimlibs-4.11.2-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.11.2-r2.ebuild,v 1.1 2013/10/30 16:55:22 dilfridge Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps."
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	!kde-misc/akonadi-social-utils
+	$(add_kdebase_dep nepomuk-core)
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
+	>=app-crypt/gpgme-1.1.6
+	>=app-office/akonadi-server-1.10.1
+	>=dev-libs/boost-1.35.0-r5:=
+	dev-libs/libgpg-error
+	>=dev-libs/libical-0.43
+	dev-libs/cyrus-sasl
+	>=dev-libs/qjson-0.8.1
+	media-libs/phonon
+	x11-misc/shared-mime-info
+	prison? ( media-libs/prison )
+	ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.9.1-boostincludes.patch"
+	"${FILESDIR}/${PN}-4.11.2-sentuuid.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_find_package ldap)
+		$(cmake-utils_use_find_package prison)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+	rm "${ED}"/usr/share/apps/cmake/modules/FindQJSON.cmake
+	rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with	net-im/choqok
+}