[SCM] Akonadi packaging branch, debian/sid, updated. debian/16.04.3-5-1-g00831a5

[Dmitry Shachnev]

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

The following commit has been merged in the debian/sid branch:
commit 00831a5fef8dbf1e8030677bbd083f83b31fc2e6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Aug 25 19:52:44 2017 +0300

    Backport upstream changes to not #include .cpp files in tests sources.
    
    Closes: #871147.
---
 debian/patches/do_not_include_cpp.diff | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/do_not_include_cpp.diff b/debian/patches/do_not_include_cpp.diff
new file mode 100644
index 0000000..6f767cd
--- /dev/null
+++ b/debian/patches/do_not_include_cpp.diff
@@ -0,0 +1,32 @@
+Description: do not include cpp files in tests
+Origin: upstream
+ https://cgit.kde.org/akonadi.git/commit/?id=bf2fddd8ecb9a8e3 for collectionsynctest.cpp
+ https://cgit.kde.org/akonadi.git/commit/?id=2e658b98faf9d889 for actionstatemanagertest.cpp
+Last-Update: 2017-08-25
+
+--- a/autotests/libs/actionstatemanagertest.cpp
++++ b/autotests/libs/actionstatemanagertest.cpp
+@@ -27,8 +27,6 @@
+ #include "../src/widgets/actionstatemanager.cpp"
+ #undef QT_NO_CLIPBOARD
+ 
+-#include "../src/core/pastehelper.cpp"
+-
+ typedef QHash<Akonadi::StandardActionManager::Type, bool> StateMap;
+ Q_DECLARE_METATYPE(StateMap)
+ 
+--- a/autotests/libs/collectionsynctest.cpp
++++ b/autotests/libs/collectionsynctest.cpp
+@@ -25,9 +25,11 @@
+ #include <collection.h>
+ #include <collectionfetchjob.h>
+ #include <collectionfetchscope.h>
++#include <collectiondeletejob.h>
++#include <collectionmodifyjob.h>
+ #include <entitydisplayattribute.h>
+ 
+-#include "../src/core/collectionsync.cpp"
++#include "../src/core/collectionsync_p.h"
+ 
+ #include <krandom.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8c49299..596eaba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ 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
+do_not_include_cpp.diff

-- 
Akonadi packaging