1 |
commit: 3b8279611688f3898c5b6c5e76e0062d7fbed123 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 9 00:32:48 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 9 00:33:39 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b827961 |
7 |
|
8 |
app-text/kjots: Fix build with kde-apps/akonadi-notes-22.04.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/840272 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../kjots/files/kjots-5.1.0-akonadi-22.04.0.patch | 87 ++++++++++++++++++++++ |
15 |
app-text/kjots/kjots-5.1.0-r2.ebuild | 1 + |
16 |
2 files changed, 88 insertions(+) |
17 |
|
18 |
diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..a5ef2cc2cdf9 |
21 |
--- /dev/null |
22 |
+++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch |
23 |
@@ -0,0 +1,87 @@ |
24 |
+From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001 |
25 |
+From: Nicolas Fella <nicolas.fella@×××.de> |
26 |
+Date: Tue, 1 Mar 2022 23:33:19 +0100 |
27 |
+Subject: [PATCH] Fix akonadi includes |
28 |
+ |
29 |
+--- |
30 |
+ src/kjotsmodel.cpp | 2 +- |
31 |
+ src/kjotswidget.cpp | 2 +- |
32 |
+ src/noteshared/notecreatorandselector.cpp | 2 +- |
33 |
+ src/noteshared/standardnoteactionmanager.cpp | 2 +- |
34 |
+ 4 files changed, 4 insertions(+), 4 deletions(-) |
35 |
+ |
36 |
+ |
37 |
+From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001 |
38 |
+From: Wolfgang Bauer <wbauer@×××.at> |
39 |
+Date: Fri, 1 Apr 2022 08:00:34 +0000 |
40 |
+Subject: [PATCH] Fix build with Akonadi 21.12 |
41 |
+ |
42 |
+--- |
43 |
+ src/kjotsmodel.cpp | 4 ++++ |
44 |
+ src/kjotswidget.cpp | 6 +++++- |
45 |
+ src/noteshared/notecreatorandselector.cpp | 4 ++++ |
46 |
+ src/noteshared/standardnoteactionmanager.cpp | 4 ++++ |
47 |
+ 4 files changed, 17 insertions(+), 1 deletion(-) |
48 |
+ |
49 |
+diff -u a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp |
50 |
+--- a/src/kjotsmodel.cpp |
51 |
++++ b/src/kjotsmodel.cpp |
52 |
+@@ -21,7 +21,11 @@ |
53 |
+ #include <AkonadiCore/ChangeRecorder> |
54 |
+ #include <AkonadiCore/EntityDisplayAttribute> |
55 |
+ #endif |
56 |
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) |
57 |
++#include <Akonadi/NoteUtils> |
58 |
++#else |
59 |
+ #include <Akonadi/Notes/NoteUtils> |
60 |
++#endif |
61 |
+ |
62 |
+ #include <KMime/Message> |
63 |
+ #include <KPIMTextEdit/TextUtils> |
64 |
+diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp |
65 |
+--- a/src/kjotswidget.cpp |
66 |
++++ b/src/kjotswidget.cpp |
67 |
+@@ -34,8 +34,12 @@ |
68 |
+ #include <QDebug> |
69 |
+ |
70 |
+ // Akonadi |
71 |
+-#include <Akonadi/Notes/NoteUtils> |
72 |
+ #include <akonadi_version.h> |
73 |
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) |
74 |
++#include <Akonadi/NoteUtils> |
75 |
++#else |
76 |
++#include <Akonadi/Notes/NoteUtils> |
77 |
++#endif |
78 |
+ #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) |
79 |
+ #include <Akonadi/AttributeFactory> |
80 |
+ #include <Akonadi/CollectionCreateJob> |
81 |
+diff -u a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp |
82 |
+--- a/src/noteshared/notecreatorandselector.cpp |
83 |
++++ b/src/noteshared/notecreatorandselector.cpp |
84 |
+@@ -24,7 +24,11 @@ |
85 |
+ #include <AkonadiCore/EntityTreeModel> |
86 |
+ #include <AkonadiCore/ItemCreateJob> |
87 |
+ #endif |
88 |
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) |
89 |
++#include <Akonadi/NoteUtils> |
90 |
++#else |
91 |
+ #include <Akonadi/Notes/NoteUtils> |
92 |
++#endif |
93 |
+ |
94 |
+ #include "noteshared_debug.h" |
95 |
+ |
96 |
+diff -u a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp |
97 |
+--- a/src/noteshared/standardnoteactionmanager.cpp |
98 |
++++ b/src/noteshared/standardnoteactionmanager.cpp |
99 |
+@@ -25,7 +25,11 @@ |
100 |
+ #include <AkonadiCore/CollectionModifyJob> |
101 |
+ #include <AkonadiCore/ItemModifyJob> |
102 |
+ #endif |
103 |
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) |
104 |
++#include <Akonadi/NoteUtils> |
105 |
++#else |
106 |
+ #include <Akonadi/Notes/NoteUtils> |
107 |
++#endif |
108 |
+ |
109 |
+ #include <KXmlGui/KActionCollection> |
110 |
+ #include <KLocalizedString> |
111 |
|
112 |
diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild |
113 |
index a948d3a45db6..7ef5fe968253 100644 |
114 |
--- a/app-text/kjots/kjots-5.1.0-r2.ebuild |
115 |
+++ b/app-text/kjots/kjots-5.1.0-r2.ebuild |
116 |
@@ -51,4 +51,5 @@ PATCHES=( |
117 |
"${FILESDIR}/${P}-missing-lib.patch" |
118 |
"${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580 |
119 |
"${FILESDIR}/${P}-speech-optional.patch" # bug 835128 |
120 |
+ "${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272 |
121 |
) |