[neon/extras/kjots/Neon/release] debian: Add patch to allow building against KDE PIM 22.04.

Patrick Franz null at kde.org
Wed Jul 27 16:05:45 BST 2022


Git commit 70802043bce663acbc309cf38ba8d5253cd42665 by Patrick Franz.
Committed on 28/06/2022 at 12:52.
Pushed by jriddell into branch 'Neon/release'.

Add patch to allow building against KDE PIM 22.04.

M  +3    -0    debian/changelog
A  +52   -0    debian/patches/b9d91006.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/extras/kjots/commit/70802043bce663acbc309cf38ba8d5253cd42665

diff --git a/debian/changelog b/debian/changelog
index 98193f1..64f14ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kjots (4:5.1.0-4) UNRELEASED; urgency=medium
 
+  [ Patrick Franz ]
+  * Add patch to allow building against KDE PIM 22.04.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 Jun 2022 14:48:22 +0200
 
 kjots (4:5.1.0-3) unstable; urgency=medium
diff --git a/debian/patches/b9d91006.patch b/debian/patches/b9d91006.patch
new file mode 100644
index 0000000..e159b27
--- /dev/null
+++ b/debian/patches/b9d91006.patch
@@ -0,0 +1,52 @@
+diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
+index 99ee14f979d9e67840758d20cb090fc20f75e9f4..48997a415e5dbbb6b6dc4e5edcb1691d372e53e0 100644
+--- a/src/kjotsmodel.cpp
++++ b/src/kjotsmodel.cpp
+@@ -21,7 +21,7 @@
+ #include <AkonadiCore/ChangeRecorder>
+ #include <AkonadiCore/EntityDisplayAttribute>
+ #endif
+-#include <Akonadi/Notes/NoteUtils>
++#include <Akonadi/NoteUtils>
+ 
+ #include <KMime/Message>
+ #include <KPIMTextEdit/TextUtils>
+diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
+index 834fc339c1c4b1d4e953ade0ec658f21405b9917..bb4d018d46ca4c7d146872466c047bdea0cdcc89 100644
+--- a/src/kjotswidget.cpp
++++ b/src/kjotswidget.cpp
+@@ -34,7 +34,7 @@
+ #include <QDebug>
+ 
+ // Akonadi
+-#include <Akonadi/Notes/NoteUtils>
++#include <Akonadi/NoteUtils>
+ #include <akonadi_version.h>
+ #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+ #include <Akonadi/AttributeFactory>
+diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp
+index 6d58c836be7c2bdfa510fc19f54c95f40227d828..7518deb0656cc900a69188cf21f3ab48d2c21a0c 100644
+--- a/src/noteshared/notecreatorandselector.cpp
++++ b/src/noteshared/notecreatorandselector.cpp
+@@ -24,7 +24,7 @@
+ #include <AkonadiCore/EntityTreeModel>
+ #include <AkonadiCore/ItemCreateJob>
+ #endif
+-#include <Akonadi/Notes/NoteUtils>
++#include <Akonadi/NoteUtils>
+ 
+ #include "noteshared_debug.h"
+ 
+diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp
+index 2a2f4cee0227941aec5042694a2f1a67bdf01d8c..692b8a2380fd91c9e2c5deb778b669e9e6da366b 100644
+--- a/src/noteshared/standardnoteactionmanager.cpp
++++ b/src/noteshared/standardnoteactionmanager.cpp
+@@ -25,7 +25,7 @@
+ #include <AkonadiCore/CollectionModifyJob>
+ #include <AkonadiCore/ItemModifyJob>
+ #endif
+-#include <Akonadi/Notes/NoteUtils>
++#include <Akonadi/NoteUtils>
+ 
+ #include <KXmlGui/KActionCollection>
+ #include <KLocalizedString>
diff --git a/debian/patches/series b/debian/patches/series
index 03d7533..1104e48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 3d3cee8c.patch
 581548a1.patch
+b9d91006.patch



More information about the Neon-commits mailing list