[SCM] Akonadi packaging branch, debian/sid, updated. debian/16.04.3-4-2-g0b92f37

[Dmitry Shachnev]

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

The following commit has been merged in the debian/sid branch:
commit 0b92f37b12beb472735c46595a0d21a20bcf91f5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jul 7 16:27:38 2017 +0300

    Add a patch from upstream to fix build with Qt 5.9.
---
 debian/patches/fix_build_with_qt_5.9.diff | 24 ++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/fix_build_with_qt_5.9.diff b/debian/patches/fix_build_with_qt_5.9.diff
new file mode 100644
index 0000000..0e45606
--- /dev/null
+++ b/debian/patches/fix_build_with_qt_5.9.diff
@@ -0,0 +1,24 @@
+Description: fix compilation with qtbase 5.9
+Origin: upstream, https://cgit.kde.org/akonadi.git/commit/?id=eb5cf0fa46aecd77
+Last-Update: 2017-06-26
+
+--- a/src/core/item_p.h
++++ b/src/core/item_p.h
+@@ -268,11 +268,17 @@
+ typedef std::vector<_detail::TypedPayload> PayloadContainer;
+ }
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) // see qtbase e5e2629
++namespace QtPrivate {
++#endif
+ // disable Q_FOREACH on PayloadContainer (b/c it likes to take copies and clone_ptr doesn't like that)
+ template <>
+ class QForeachContainer<Akonadi::PayloadContainer>
+ {
+ };
++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
++}
++#endif
+ 
+ namespace Akonadi
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 93912f0..8c49299 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ set_dependency_order.diff
 QSqlite3-fix-build-with-Qt-5.7.patch
 kubuntu_disable_secure_file_priv_check.diff
 Delete-the-properties-window-if-closed.patch
+fix_build_with_qt_5.9.diff

-- 
Akonadi packaging