Revision bump backporting the fix for kde bug 278082

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

4 files changed, 183 insertions, 17 deletions

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 9fbaa57a411c..9c440fd16a86 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.163 2013/10/10 05:26:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.164 2013/10/22 21:13:54 dilfridge Exp $
+
+*kdepim-runtime-4.11.2-r1 (22 Oct 2013)
+
+  22 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepim-runtime-4.11.2.ebuild, +kdepim-runtime-4.11.2-r1.ebuild,
+  +files/kdepim-runtime-4.11.2-flags.patch:
+  Revision bump backporting the fix for kde bug 278082
 
 *kdepim-runtime-4.4.11.1-r1 (10 Oct 2013)
 
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index e1a953e9ab98..5fee4972bfa8 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -4,28 +4,31 @@ Hash: SHA256
 AUX 4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch 909 SHA256 ab132ee0abe2b2d847344b53ddad902fef720975327a6110faf70bd60837087e SHA512 f549ee9acd4914ee3f7e241af6e15f4f9c6f7bb25f016fa8d80b0d764c622f563d55a5a16098747c09bbde2392477cfcb31e21f84f1d00a4b09da7c52b164d0c WHIRLPOOL cef4d0796d0dd0da271aec96e8ea2823d3cfad8cfe194bcf9538346949c5bb902f2dae7abedc360995115e8a53b198674912938c6762e8d31f55147d963fb276
 AUX 4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch 4012 SHA256 6d22b29e0594df9fedd2fce966262fcae307eb9ad7d67040d928f35a1cef234c SHA512 70fb1256867d9526169aa1ec2aeefb1c42cf82fca842bd342b9859f6ba3f252f941d218a76374aa09e0ef8068b2d3a460f9ea4e23cddc43565841021b7aec62a WHIRLPOOL 4e554bd3576f4ac1bd58de4fb5f805732c8653dc2eb50b50ca811fb7431f3b1a81f0d04404aaeb16bb660eaf199a41aae37ac4755d7ad160ddd0343baf2b5203
 AUX kdepim-runtime-4.10.5-fix-autoconfig.patch 745 SHA256 2149f6b4c5da38cc152caf623bb56a087ef83f6850a70c7068dba1e3e713d867 SHA512 68489aff384729183f24618c8b5fe3a9c61118671eeed9b7afcfaf4d51331db299dbaa88a063b338eeb1f31c50e98f9c08389f6f8bac43b84936c2066ea4e4ac WHIRLPOOL ee7ec08ed73bca753c5928e6e5c4f852e45eddaf35523e8db5a1210173365a33f5c9347b552749bc483ee415ad012e9852e31aec65f0bf53176c62f385627d9b
+AUX kdepim-runtime-4.11.2-flags.patch 6459 SHA256 684cd5513d81cc2c3c50c6fba6102861f4910a0f2dcef7c814e7cd90f211f59f SHA512 ea99fb6279fbf1cfd4d5e40e2b556238259b501f61351a9959948d4d56efca5bcc0d439effc8f762f156be2a15bead615614f50c9d4dd4a39ca4927a718e2ccc WHIRLPOOL d3ec6636e789a5fc09bc6c0146307f1d0f8fc43f3d15b2aa050394db6c14e35eeb52fc1a6c292854451e713772ff182a9285a208f8f8e6031157d108b6401b52
 DIST kdepim-runtime-4.10.5.tar.xz 1210604 SHA256 83e6f9bfcb223d6b305105fa822d112a00c53160549b94e0390fb0c6f11f49dc SHA512 6535104af64b810a83966ce79e6b63c51d1136c611c2ce32e3e8cda6df8cc9fb18d687c29254ad6503433344156db904b6a8017dae5ca3ab53a9564a40f28835 WHIRLPOOL 76f7c3213646cc51027dfedb544f449bdacc72ae03b932cdcf98e55ace80f0513c62dfb3f818d109953f7d8322136014324d2250905bb67621ecf40dc37ee6f1
 DIST kdepim-runtime-4.11.2.tar.xz 1227080 SHA256 95bb87f3c911d012aa4831bb8d6b8dbe56cadf2529f9753d74fa6db3164e438e SHA512 9bb78c9dd67dbe0923c1bb2a4f43e9ef5c8a06559a07edfbdf533e3722d290806cd88c972d689bb88bf7853f913cfe290ec2ac94f97ff9d59cddb2bee9cfeb22 WHIRLPOOL af87f0c9d31c8223d8bef8c5ab92f7277850f180dc1d88909da2b69f1e2f9da23694f7e70fa02aa65a50a01a5e32161cc78f03b378911421e590f098a052b0fc
 DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6 SHA512 37f0de7b37ef1d4b116c258e35644f99a6734082cdd5a984962246dc58ab9124020cdd31350a06058e067b0ea3fcddbd864beef6dbb13ca529b637a2a51071ad WHIRLPOOL c1fe887ebc1162aab17cda15f294b94ec06e3690221647fabe0fe2ab7ae718f2624bf100cc068771744ec4a951c539004ee2139bae965e32ac49002c66929b71
 EBUILD kdepim-runtime-4.10.5-r1.ebuild 1277 SHA256 d323bda35d5070943e51f4578d1135cd200b3d7b457599dd1cd631c498f4d0c7 SHA512 4571678c3687ec4c28350987508e1a95c4a90896269f29c5f5fc9090580ec8cf364b3e66ccc7204e405e88e66d723b5218382de2f94e1c0669f375eb3c4088e5 WHIRLPOOL b8ea981b749cd3f65912c1a74c7fb5fd6df19812459e9f8403595f56d920b90a9ce034df8ecb958d0c6706c7397256a128fc65cd2a6f1eed03f3b4ae6640df65
-EBUILD kdepim-runtime-4.11.2.ebuild 1249 SHA256 7f3942bc11d81a5328ff427a4154df878937dc8b00d30002b834866aa43dc9bd SHA512 e5b68f12fcfbb72a50e7d4d35829272dc178acae49c102a5b8557ce0e3b9bfbf182b18353aba13f79120a3a8aa1ac28c86ed1223dc8d3a50b72add0cc10a244e WHIRLPOOL 1d654cfd6e7eba040c9e56a8ec4957d7f3a767d1181fea974c9131028509021819e569e6258302b1287fc10c156228397d999ff18bd3c406e5bacdddaaa1a5ec
+EBUILD kdepim-runtime-4.11.2-r1.ebuild 1297 SHA256 992c1b93d0a119ff6c6251f17bb12dfd2b2208e37ce3133b81b9bfa5df39c870 SHA512 c3e7c7a23f8f2d8778fcaf3045e3e6c85ba2fd4ed339b867c50926d34cb95f79c756eb56a0ab57cd154901db5d3588ba8e161fbec1b489ac791f2b69bd2ee649 WHIRLPOOL 7145310df962c35b409da0103d609523a680e0d37f1fe06cd6d89be4f62eb3b400f187f6a01fb6f8ea2d88a1927eaae3a4024480821e8c7b20e6b0e2833a38fa
 EBUILD kdepim-runtime-4.4.11.1-r1.ebuild 1023 SHA256 36cff58c8a8aab0426cae521c21d168be57baf55b2dcb0af8f66baea524782c5 SHA512 e0b12ea354c69ca74068c1dcee726a2728373dacc1c147720c64c93719ff83d198eb38612d2a6bc36411e60be556778138ec38a486b3a827d8574724a14b0fbd WHIRLPOOL 5f78aaaf43d086fcdf8064bdfe951a5ce2f8fd36c9ccb007c309af79ca6f1fd9114b3b957b1888290f4a8f9d63a9e7f10163bd80f5f9ae53335838a23a976b17
-MISC ChangeLog 23272 SHA256 0d76d7470e09bea839b3ce305192e8149c023ad4b95a47db0821c7a4ea451efa SHA512 b094fc1e9071cc63e43da093be75683ecd85a8ebee114fe6c7f8d2c6386179f8769aefd234813a073519b56ad34da49183d6e0569829582283b170c836d4f468 WHIRLPOOL 5ea944ff137b92dc480edad4356e1630c27646dafd50ae505a73312e92304de2ba32f06c3c8d1b7a6ea4eb30499b39f6b653ac22b98e03bf99aef8f3334025a7
+MISC ChangeLog 23538 SHA256 c92935f297d29da17e3caf17e593e6234c43126109fb17de941c8b8d777ff885 SHA512 29bb5523f0f30f43bbd6d4730adc374c4ea004d45bc6a6ff69bf26cce6afd5d2d200dd8b8802d6855688e9a667132ec1405a900a8226e3a52efc0bb4223ff8b1 WHIRLPOOL f83f2b272df5faab9ab116fd6f5dbee22a011447bd61e97697adfcc6d1bf66f3afe176f8d44bc106823bb386a87bb02c1b2af7f122d245d956d3679bf34017b2
 MISC metadata.xml 350 SHA256 bafffe596d33a865d1b37fe2debe878eb0858e69f7ad79a2d30c5229ba73f6c4 SHA512 48644af0621dbd39d5d60c25b4326469eaa5b80525798e721113287933f174e63702a33ce20fa54b08b2f9aca7d00684b1a4aeecb9c0eaabc3612a2deefbfdc1 WHIRLPOOL 32fe40728eb501b4a519ec6daff3d85d86b0a020aaae504928f24948cb2d5e8782f106daa3c7f66deb2aee84963dd80540f1e0dd8185229b9bbe556da01801b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSVlxSAAoJEPiazRVxLXTF8AAQAMA92QRo4L670gxNlBGLKm7A
-x3mwdvyNTD87ORrA0UUlE2Am8AUpUTqkcXzT9rFbA9ZSKJP4u79yi1RsCu6QkXFp
-T0b4IXVsc+n/PAKMEpCrFbPzUuLXuyNWju6JK0VUgmNtPF+yQXOPAMOST9Vtdif3
-o+8GDRqitNhrZtzFJ51ekmmdYs5ko0jMQ1GgOA1b5JRFund9UDWm9kEqoypFnMGm
-Q/6sDnASo1jHGd53Kcgi0CXB0kbz2TQHw1Xy9HiEvML5SeLvdH4BzXNacjQovCtn
-FR+/GzJTOocOz3HXATIYYxNUaGr4rMQ8mYVQ1hJIbLq2IZr33FglpElLavnDMOkT
-A11nGqXNmFUTW7zgGXH5jAdKFiXMzirGU/dpGiKWKqnl6bD4hXgL6BBd1uSwSwq1
-gGtuJBMk17TmYjgdwOpcLSZAS3t6yUPFr0CvOAbqA4AW4MCcyjEdl2gYyHUvI/O8
-SbL1y/MOCOdMz18Cc+jo8TuavSkeMOen2ARpPfKGsqbxO1QHaVgqtQiJp/wI3iQD
-M5BVP+tsEGdUgbfv0TPsDWKOjLuNUT7O3BwdoWx0bFUmEuAskTcEaHklKki+KU8E
-nWYBQ/AJOelnZGJfFftFQLrF2aYjlZvHDibi1vWKdcNWLhOse9Ry1zQrhzn+wKLa
-SJR23PJ2OhuRq/O3/yUO
-=pHYj
+iQJ8BAEBCABmBQJSZuqpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcObgP/0pcpJWrUfmkGp+/O6FXrS6Q
+cNbeJYF5srUdjdf44sSYWmKCU1ud78tX9WexM4geMc0CWcTzf4KWghE1+mj9Ns7t
+BXG7QXIIW2P7IDkF1MUNRV8KBnCQKcTq0LOs0NBk3pIbUF2RFsW3cY5K3UMV/MQk
+XZC/i4SZmQ2HpEhMimRrfXmlzApfvLXVdgZYNHq2xZd3NTGITH5O2oCb+zfsfrqC
+bDBly3MVJcb1MGqF6tcPqxGmdd+SuqJIfGQzgdvtvR8kU2qCnEuYp6S0fE887ji0
+RiaMCeTYbqs7Jc92QG+rzAU21RnN0m3vkO9EifDJTCuOOrj1KVCxOkTM+hYfMiJ8
+jwMip21zaFYmCbupOPPXVAxTHk37cBf39ZUR7vEaVaZ9FlopK1CEkv/mBS3uCQ/G
+f3iUiaYzA6bjxAQP75xlx6fOUoMfCkB+FESZ0TGyBfvaejMzMrIVY31bA0NynHR4
+ln4UkB4GzO/orjbK4JqdE3rNuqlr2a9DXyoiVqHUxbuitMVYq5MWK+BAUg6k6VM5
+5KBFDg3PzA1UxvhVea/sy7zkM9mWArm65N5xRM727NJQbmLlNBT5FhC3w5xWhHIN
+NmBdplWKz0rcif1hNvT4ENXC8LSmZrVZnBsQrze4noQ/uBMfqSLEPD8HTCb9l7Gk
+Y1L5AfU9y/uC1DYyo+Wj
+=QZ65
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.11.2-flags.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.11.2-flags.patch
new file mode 100644
index 000000000000..b6ca2df2d529
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.11.2-flags.patch
@@ -0,0 +1,154 @@
+commit c561149538336804f212f5a12ea6cf3d1a3a19f5
+Author: Andre Woebbeking <Woebbeking@kde.org>
+Date:   Fri Sep 27 22:19:42 2013 +0200
+
+    Don't bother IMAP servers with not supported flags
+    
+    Created a new method ResourceTask::fromAkonadiToSupportedImapFlags() to convert
+    Akonadi to IMAP flags supported by the server and use it everywhere instead of
+    fromAkonadiFlags().
+    
+    fromAkonadiFlags() was made private to make it impossible to call it by accident.
+    
+    BUG:278082
+    FIXED-IN: 4.11.3
+    REVIEW:112724
+    
+    CCBUG:287356
+    
+    This also reduces the risk to trigger 287356 as the insert on the IMAP server
+    doesn't fail due to unsupported IMAP flags.
+
+diff --git a/resources/imap/additemtask.cpp b/resources/imap/additemtask.cpp
+index da965a1..af427ff 100644
+--- a/resources/imap/additemtask.cpp
++++ b/resources/imap/additemtask.cpp
+@@ -64,7 +64,7 @@ void AddItemTask::doStart( KIMAP::Session *session )
+   KIMAP::AppendJob *job = new KIMAP::AppendJob( session );
+   job->setMailBox( mailBox );
+   job->setContent( msg->encodedContent( true ) );
+-  job->setFlags( fromAkonadiFlags( item().flags().toList() ) );
++  job->setFlags( fromAkonadiToSupportedImapFlags( item().flags().toList() ) );
+   connect( job, SIGNAL(result(KJob*)), SLOT(onAppendMessageDone(KJob*)) );
+   job->start();
+ }
+diff --git a/resources/imap/changeitemsflagstask.cpp b/resources/imap/changeitemsflagstask.cpp
+index 1c7f415..d7eb183 100644
+--- a/resources/imap/changeitemsflagstask.cpp
++++ b/resources/imap/changeitemsflagstask.cpp
+@@ -91,7 +91,7 @@ KIMAP::StoreJob* ChangeItemsFlagsTask::prepareJob( KIMAP::Session *session )
+ void ChangeItemsFlagsTask::triggerAppendFlagsJob(KIMAP::Session* session)
+ {
+   KIMAP::StoreJob *store = prepareJob( session );
+-  store->setFlags( fromAkonadiFlags( addedFlags().toList() ) );
++  store->setFlags( fromAkonadiToSupportedImapFlags( addedFlags().toList() ) );
+   store->setMode( KIMAP::StoreJob::AppendFlags );
+   connect( store, SIGNAL(result(KJob*)), SLOT(onAppendFlagsDone(KJob*)) );
+   store->start();
+@@ -100,7 +100,7 @@ void ChangeItemsFlagsTask::triggerAppendFlagsJob(KIMAP::Session* session)
+ void ChangeItemsFlagsTask::triggerRemoveFlagsJob(KIMAP::Session* session)
+ {
+   KIMAP::StoreJob *store = prepareJob( session );
+-  store->setFlags( fromAkonadiFlags( removedFlags().toList() ) );
++  store->setFlags( fromAkonadiToSupportedImapFlags( removedFlags().toList() ) );
+   store->setMode( KIMAP::StoreJob::RemoveFlags );
+   connect( store, SIGNAL(result(KJob*)), SLOT(onRemoveFlagsDone(KJob*)) );
+   store->start();
+diff --git a/resources/imap/changeitemtask.cpp b/resources/imap/changeitemtask.cpp
+index 1a5e969..242e202 100644
+--- a/resources/imap/changeitemtask.cpp
++++ b/resources/imap/changeitemtask.cpp
+@@ -34,7 +34,6 @@
+ 
+ #include "imapflags.h"
+ #include "uidnextattribute.h"
+-#include "collectionflagsattribute.h"
+ 
+ ChangeItemTask::ChangeItemTask( ResourceStateInterface::Ptr resource, QObject *parent )
+   : ResourceTask( DeferIfNoSession, resource, parent ), m_session( 0 ), m_oldUid( 0 ), m_newUid( 0 )
+@@ -67,7 +66,7 @@ void ChangeItemTask::doStart( KIMAP::Session *session )
+ 
+     job->setMailBox( mailBox );
+     job->setContent( msg->encodedContent( true ) );
+-    job->setFlags( fromAkonadiFlags( item().flags().toList() ) );
++    job->setFlags( fromAkonadiToSupportedImapFlags( item().flags().toList() ) );
+ 
+     connect( job, SIGNAL(result(KJob*)),
+              this, SLOT(onAppendMessageDone(KJob*)) );
+@@ -105,19 +104,7 @@ void ChangeItemTask::onPreStoreSelectDone( KJob *job )
+ 
+ void ChangeItemTask::triggerStoreJob()
+ {
+-  QList<QByteArray> flags = fromAkonadiFlags( item().flags().toList() );
+-  Akonadi::CollectionFlagsAttribute *flagAttr = item().parentCollection().attribute<Akonadi::CollectionFlagsAttribute>();
+-  // the server does not support arbitrary flags, so filter out those it can't handle
+-  if ( flagAttr && !flagAttr->flags().isEmpty() && !flagAttr->flags().contains( "\\*" ) ) {
+-    for ( QList< QByteArray >::iterator it = flags.begin(); it != flags.end(); ) {
+-      if ( flagAttr->flags().contains( *it ) ) {
+-        ++it;
+-      } else {
+-        kDebug() << "Server does not support flag" << *it;
+-        it = flags.erase( it );
+-      }
+-    }
+-  }
++  QList<QByteArray> flags = fromAkonadiToSupportedImapFlags( item().flags().toList() );
+ 
+   KIMAP::StoreJob *store = new KIMAP::StoreJob( m_session );
+ 
+diff --git a/resources/imap/resourcetask.cpp b/resources/imap/resourcetask.cpp
+index a41e884..1de07f3 100644
+--- a/resources/imap/resourcetask.cpp
++++ b/resources/imap/resourcetask.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <KDE/KLocale>
+ 
++#include "collectionflagsattribute.h"
+ #include "imapflags.h"
+ #include "sessionpool.h"
+ #include "resourcestateinterface.h"
+@@ -347,6 +348,26 @@ void ResourceTask::showInformationDialog( const QString &message, const QString
+   m_resource->showInformationDialog( message, title, dontShowAgainName );
+ }
+ 
++QList<QByteArray> ResourceTask::fromAkonadiToSupportedImapFlags( const QList<QByteArray> &flags ) const
++{
++  QList<QByteArray> imapFlags = fromAkonadiFlags( flags );
++
++  const Akonadi::CollectionFlagsAttribute *flagAttr = collection().attribute<Akonadi::CollectionFlagsAttribute>();
++  // the server does not support arbitrary flags, so filter out those it can't handle
++  if ( flagAttr && !flagAttr->flags().isEmpty() && !flagAttr->flags().contains( "\\*" ) ) {
++    for ( QList< QByteArray >::iterator it = imapFlags.begin(); it != imapFlags.end(); ) {
++      if ( flagAttr->flags().contains( *it ) ) {
++        ++it;
++      } else {
++        kDebug() << "Server does not support flag" << *it;
++        it = imapFlags.erase( it );
++      }
++    }
++  }
++
++  return imapFlags;
++}
++
+ QList<QByteArray> ResourceTask::fromAkonadiFlags( const QList<QByteArray> &flags )
+ {
+   QList<QByteArray> newFlags;
+diff --git a/resources/imap/resourcetask.h b/resources/imap/resourcetask.h
+index f2bfed0..69c1a64 100644
+--- a/resources/imap/resourcetask.h
++++ b/resources/imap/resourcetask.h
+@@ -125,7 +125,12 @@ protected:
+   const QChar separatorCharacter() const;
+   void setSeparatorCharacter( const QChar &separator );
+ 
++  QList<QByteArray> fromAkonadiToSupportedImapFlags( const QList<QByteArray> &flags ) const;
++
+   static QList<QByteArray> toAkonadiFlags( const QList<QByteArray> &flags );
++
++private:
++
+   static QList<QByteArray> fromAkonadiFlags( const QList<QByteArray> &flags );
+ 
+ private slots:
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.11.2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.11.2-r1.ebuild
index 7e32c2b60cb3..f2baecbd96e6 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.11.2.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.11.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.11.2.ebuild,v 1.1 2013/10/09 23:03:53 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.11.2-r1.ebuild,v 1.1 2013/10/22 21:13:54 dilfridge Exp $
 
 EAPI=5
 
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
 	!kde-misc/akonadi-facebook
 "
 
+PATCHES=( "${FILESDIR}/${P}-flags.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package facebook LibKFbAPI)