[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.12.4-2-9-gcc8d20f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=7ea89b7

The following commit has been merged in the master branch:
commit 7ea89b79f776999f1ece948971100eeba448f29f
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon May 19 11:47:34 2014 +0200

    Remove upstream patch: fix_upstream_329805_akonadi_imap_crash.patch
---
 debian/changelog                                   |  1 +
 .../fix_upstream_329805_akonadi_imap_crash.patch   | 52 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abdfd89..b2fa0f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kdepim-runtime (4:4.13.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update build dependencies.
+  * Remove upstream patch: fix_upstream_329805_akonadi_imap_crash.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 18 May 2014 01:36:55 +0200
 
diff --git a/debian/patches/fix_upstream_329805_akonadi_imap_crash.patch b/debian/patches/fix_upstream_329805_akonadi_imap_crash.patch
deleted file mode 100644
index 63e4a00..0000000
--- a/debian/patches/fix_upstream_329805_akonadi_imap_crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit e376267dda6972ffc2eeea215901f08145e3c993
-Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
-Date:   Thu May 8 10:42:54 2014 +0200
-
-    IMAP-Resource: Don't crash if IDLE collection is not subscribed locally.
-    
-    BUG: 329805
-
---- a/resources/imap/imapresource.cpp
-+++ b/resources/imap/imapresource.cpp
-@@ -645,6 +645,11 @@
-   if ( !m_pool->serverCapabilities().contains( QLatin1String("IDLE") ) )
-     return;
- 
-+  //Without password we don't even have to try
-+  if (Settings::self()->password().isEmpty()) {
-+    return;
-+  }
-+
-   const QStringList ridPath = Settings::self()->idleRidPath();
-   if ( ridPath.size() < 2 )
-     return;
-@@ -672,21 +677,17 @@
- 
- void ImapResource::onIdleCollectionFetchDone( KJob *job )
- {
--  if ( job->error() == 0 ) {
--    Akonadi::CollectionFetchJob *fetch = static_cast<Akonadi::CollectionFetchJob*>( job );
--    Akonadi::Collection c = fetch->collections().first();
--
--    const QString password = Settings::self()->password();
--    if ( password.isEmpty() )
--      return;
--
--    ResourceStateInterface::Ptr state = ::ResourceState::createIdleState( this, c );
--    m_idle = new ImapIdleManager( state, m_pool, this );
--
--  } else {
-+  if (job->error()) {
-     kWarning() << "CollectionFetch for idling failed."
-                << "error=" << job->error()
-                << ", errorString=" << job->errorString();
-+    return;
-+  }
-+  Akonadi::CollectionFetchJob *fetch = static_cast<Akonadi::CollectionFetchJob*>(job);
-+  //Can be empty if collection is not subscribed locally
-+  if (!fetch->collections().isEmpty()) {
-+    ResourceStateInterface::Ptr state = ::ResourceState::createIdleState( this, fetch->collections().first() );
-+    m_idle = new ImapIdleManager( state, m_pool, this );
-   }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9e37331..5879913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 hide_akonaditray.diff
-fix_upstream_329805_akonadi_imap_crash.patch

-- 
KDE PIM Runtime module packaging