File Fix-build-with-Akonadi-21.12.patch of Package kjots
82
1
From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001
2
From: Wolfgang Bauer <wbauer@tmo.at>
3
Date: Fri, 1 Apr 2022 08:00:34 +0000
4
Subject: [PATCH] Fix build with Akonadi 21.12
5
6
---
7
src/kjotsmodel.cpp | 4 ++++
8
src/kjotswidget.cpp | 6 +++++-
9
src/noteshared/notecreatorandselector.cpp | 4 ++++
10
src/noteshared/standardnoteactionmanager.cpp | 4 ++++
11
4 files changed, 17 insertions(+), 1 deletion(-)
12
13
diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
14
index 48997a4..66f791a 100644
15
--- a/src/kjotsmodel.cpp
16
+++ b/src/kjotsmodel.cpp
17
18
#include <AkonadiCore/ChangeRecorder>
19
#include <AkonadiCore/EntityDisplayAttribute>
20
#endif
21
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
22
#include <Akonadi/NoteUtils>
23
+#else
24
+#include <Akonadi/Notes/NoteUtils>
25
+#endif
26
27
#include <KMime/Message>
28
#include <KPIMTextEdit/TextUtils>
29
diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
30
index bb4d018..0332766 100644
31
--- a/src/kjotswidget.cpp
32
+++ b/src/kjotswidget.cpp
33
34
#include <QDebug>
35
36
// Akonadi
37
-#include <Akonadi/NoteUtils>
38
#include <akonadi_version.h>
39
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
40
+#include <Akonadi/NoteUtils>
41
+#else
42
+#include <Akonadi/Notes/NoteUtils>
43
+#endif
44
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
45
#include <Akonadi/AttributeFactory>
46
#include <Akonadi/CollectionCreateJob>
47
diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp
48
index 7518deb..bbc85ee 100644
49
--- a/src/noteshared/notecreatorandselector.cpp
50
+++ b/src/noteshared/notecreatorandselector.cpp
51
52
#include <AkonadiCore/EntityTreeModel>
53
#include <AkonadiCore/ItemCreateJob>
54
#endif
55
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
56
#include <Akonadi/NoteUtils>
57
+#else
58
+#include <Akonadi/Notes/NoteUtils>
59
+#endif
60
61
#include "noteshared_debug.h"
62
63
diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp
64
index 692b8a2..2807bae 100644
65
--- a/src/noteshared/standardnoteactionmanager.cpp
66
+++ b/src/noteshared/standardnoteactionmanager.cpp
67
68
#include <AkonadiCore/CollectionModifyJob>
69
#include <AkonadiCore/ItemModifyJob>
70
#endif
71
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
72
#include <Akonadi/NoteUtils>
73
+#else
74
+#include <Akonadi/Notes/NoteUtils>
75
+#endif
76
77
#include <KXmlGui/KActionCollection>
78
#include <KLocalizedString>
79
--
80
GitLab
81
82