diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-09 02:32:48 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-09 02:33:39 +0200 |
| commit | 3b8279611688f3898c5b6c5e76e0062d7fbed123 (patch) | |
| tree | 3bb5c1fe5b0f66d8389c441d9b55070ee1dc7bee | |
| parent | dev-libs/kopeninghours: Rebase cmake patch on top of HEAD (diff) | |
| download | gentoo-3b8279611688f3898c5b6c5e76e0062d7fbed123.tar.gz gentoo-3b8279611688f3898c5b6c5e76e0062d7fbed123.tar.bz2 gentoo-3b8279611688f3898c5b6c5e76e0062d7fbed123.zip | |
app-text/kjots: Fix build with kde-apps/akonadi-notes-22.04.0
Closes: https://bugs.gentoo.org/840272
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch | 87 | ||||
| -rw-r--r-- | app-text/kjots/kjots-5.1.0-r2.ebuild | 1 |
2 files changed, 88 insertions, 0 deletions
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 new file mode 100644 index 000000000000..a5ef2cc2cdf9 --- /dev/null +++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch @@ -0,0 +1,87 @@ +From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 1 Mar 2022 23:33:19 +0100 +Subject: [PATCH] Fix akonadi includes + +--- + src/kjotsmodel.cpp | 2 +- + src/kjotswidget.cpp | 2 +- + src/noteshared/notecreatorandselector.cpp | 2 +- + src/noteshared/standardnoteactionmanager.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + + +From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer <wbauer@tmo.at> +Date: Fri, 1 Apr 2022 08:00:34 +0000 +Subject: [PATCH] Fix build with Akonadi 21.12 + +--- + src/kjotsmodel.cpp | 4 ++++ + src/kjotswidget.cpp | 6 +++++- + src/noteshared/notecreatorandselector.cpp | 4 ++++ + src/noteshared/standardnoteactionmanager.cpp | 4 ++++ + 4 files changed, 17 insertions(+), 1 deletion(-) + +diff -u a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp +--- a/src/kjotsmodel.cpp ++++ b/src/kjotsmodel.cpp +@@ -21,7 +21,11 @@ + #include <AkonadiCore/ChangeRecorder> + #include <AkonadiCore/EntityDisplayAttribute> + #endif ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include <Akonadi/NoteUtils> ++#else + #include <Akonadi/Notes/NoteUtils> ++#endif + + #include <KMime/Message> + #include <KPIMTextEdit/TextUtils> +diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp +--- a/src/kjotswidget.cpp ++++ b/src/kjotswidget.cpp +@@ -34,8 +34,12 @@ + #include <QDebug> + + // Akonadi +-#include <Akonadi/Notes/NoteUtils> + #include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include <Akonadi/NoteUtils> ++#else ++#include <Akonadi/Notes/NoteUtils> ++#endif + #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) + #include <Akonadi/AttributeFactory> + #include <Akonadi/CollectionCreateJob> +diff -u a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp +--- a/src/noteshared/notecreatorandselector.cpp ++++ b/src/noteshared/notecreatorandselector.cpp +@@ -24,7 +24,11 @@ + #include <AkonadiCore/EntityTreeModel> + #include <AkonadiCore/ItemCreateJob> + #endif ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include <Akonadi/NoteUtils> ++#else + #include <Akonadi/Notes/NoteUtils> ++#endif + + #include "noteshared_debug.h" + +diff -u a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp +--- a/src/noteshared/standardnoteactionmanager.cpp ++++ b/src/noteshared/standardnoteactionmanager.cpp +@@ -25,7 +25,11 @@ + #include <AkonadiCore/CollectionModifyJob> + #include <AkonadiCore/ItemModifyJob> + #endif ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include <Akonadi/NoteUtils> ++#else + #include <Akonadi/Notes/NoteUtils> ++#endif + + #include <KXmlGui/KActionCollection> + #include <KLocalizedString> diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild index a948d3a45db6..7ef5fe968253 100644 --- a/app-text/kjots/kjots-5.1.0-r2.ebuild +++ b/app-text/kjots/kjots-5.1.0-r2.ebuild @@ -51,4 +51,5 @@ PATCHES=( "${FILESDIR}/${P}-missing-lib.patch" "${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580 "${FILESDIR}/${P}-speech-optional.patch" # bug 835128 + "${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272 ) |