[SCM] Akonadi packaging branch, master, updated. debian/1.13.0-4-5-g569c66f

[Dmitry Smirnov]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=a772e3f

The following commit has been merged in the master branch:
commit a772e3f9bff75efa6b422dfa3ad97c5f34aba036
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sun Jul 19 20:28:06 2015 +1000

    New upstream patch: "upstream-prevent-QTimer-negative-interval.patch"
---
 debian/patches/series                              |  1 +
 ...upstream-prevent-QTimer-negative-interval.patch | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 7305176..64ff0ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ postgresql9.4.patch
 upstream-fix_typo_in_if_condition.patch
 upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch
 upstream-do_not_crash_when_setmntent_returns_NULL.patch
+upstream-prevent-QTimer-negative-interval.patch
 upstream-use-QAtomicInt.patch
 upstream_dont_call_insert_from_Q_ASSERT.patch
 upstream_dont_leak_old_external_payload_files.patch
diff --git a/debian/patches/upstream-prevent-QTimer-negative-interval.patch b/debian/patches/upstream-prevent-QTimer-negative-interval.patch
new file mode 100644
index 0000000..929b465
--- /dev/null
+++ b/debian/patches/upstream-prevent-QTimer-negative-interval.patch
@@ -0,0 +1,27 @@
+From de9bd9043e8878fc472ced1669bc7d49b07c2062 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= <rjvbertin at gmail.com>
+Date: Mon, 3 Nov 2014 16:56:56 +0100
+Subject: [PATCH] prevent starting a QTimer with a negative interval
+ Review: 120800
+
+---
+ server/src/collectionscheduler.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/server/src/collectionscheduler.cpp b/server/src/collectionscheduler.cpp
+index 8d4cd5c..9ba632f 100644
+--- a/server/src/collectionscheduler.cpp
++++ b/server/src/collectionscheduler.cpp
+@@ -82,7 +82,8 @@ class PauseableTimer : public QTimer
+         return;
+       }
+ 
+-      start( interval() - ( mStarted.secsTo( mPaused ) * 1000 ) );
++      const int remainder = interval() - ( mStarted.secsTo( mPaused ) * 1000 );
++      start( qMax( 0, remainder ) );
+       mPaused = QDateTime();
+       // Update mStarted so that pause() can be called repeatedly
+       mStarted = QDateTime::currentDateTime();
+-- 
+2.1.4
+

-- 
Akonadi packaging