From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 May 2022 16:42:50 +0300
Subject: gentoo resync : 12.05.2022

---
 app-text/kjots/Manifest                            |  3 +-
 .../kjots/files/kjots-5.1.0-akonadi-22.04.0.patch  | 87 ++++++++++++++++++++++
 app-text/kjots/kjots-5.1.0-r2.ebuild               |  1 +
 3 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch

(limited to 'app-text/kjots')

diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index d80cd7216045..5f76db3869a6 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,8 +1,9 @@
 AUX kjots-5.1.0-akonadi-21.12.0.patch 8215 BLAKE2B a192b70f325a84423b88144fdb5dc70a07b10c84cb0feb8faf74859fd1668f97db6972841bad74e313afba46c09cd2d882297cc72b1c8c00e9b5dfe68874fb75 SHA512 5487f7ea196479a64e72d8a8fe2f9f7ba7ed60c3932703795f0698325c737d08aff3c63d36ef60a9c66f2660f6c5318239c493db926d50a98df61256be0b9f65
+AUX kjots-5.1.0-akonadi-22.04.0.patch 2800 BLAKE2B 86c4b1cb8e1890e35c12b55b4c5db4b9a4c292b771827c12339a311fdc2603a1634430d39bbe14e7dfe6e7b7b2a8038c52ced44c31a76064675732cdd2db8504 SHA512 75ee080a7d8c1a7096548514758e805a105bfc920ca9cdd8f3de8fcc738b1b60d374549ee2249b699546ecc89721d38ed9958cf6dfd583e924eed5532e5698d5
 AUX kjots-5.1.0-implicit-dep.patch 983 BLAKE2B ca6a6b7b8e72aa0729d3e7ca9d5ecdf24673ef33ef8b752dd5513b93fd25d4b6c1adebd8a8b238d29d04c2bd6802f3303d968effed54d16dca30d6a96815fc11 SHA512 7c68f0807d764222b5b4b8114d4cbd7bfc4922d735b1a12de621bed943d666a4fefbf17ce7ea43eb6cca029cb77b1fb7d217279b3be1cb5a99a3db0f5fc530b8
 AUX kjots-5.1.0-missing-lib.patch 683 BLAKE2B 719f3c4ef39856c33b683f4c7edca664f89510f6b1f21ffd2ca285eb63db4b729c9b2091c704452adbda326eaef61ebba9b3ccce643548c1bdd2f3044687af92 SHA512 c87c741b036b5958faa3a9c892be469ea73e8809807da8f000fc55ae4219996731907d458cacae3f08eb0c3fb8d40e391490f03047dbfed900a3253bb46536c3
 AUX kjots-5.1.0-speech-optional.patch 2921 BLAKE2B daa773ddf2c40dce83891a3afc35c209343d2e9a71673dce669132aa998fdfa225eab03fa8df0bcdd0a1c9694ebfa117c4fe9da129b63979aa37fe797a74edc7 SHA512 a7f4b30b04e1bf6bc403a9baad213d92f96fe147b7f5a279a2f19d3f0758714dfc3c99bbeced7bea6bc2a36e3246407152e4e276c162ade88f1de71fed0b2af8
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.1.0-r2.ebuild 1488 BLAKE2B 14a659b4a2e627fbeb9112ea16568dcf459ccfecb586aa59a2f4b9d6a552503bce68b8061fe9b28200fc36a54475d7b4c884931f100a6ee4141dfde39c730c44 SHA512 4ef7c7e3753bb342042cc8c933bd488b35b620d1ab1d3f591caa3aa57b06a7cd403839881319e3ff3bec475406258c5678d0404914052032d39cf1a065cecce4
+EBUILD kjots-5.1.0-r2.ebuild 1543 BLAKE2B 65e2142e188113e795cd50d8fcdb25f052bad9530d96401c16ab6cb6b1a4b2b3c377d86e5c8d449c9af3d0c27d3a00e298448152c9a81c1659e3361797094526 SHA512 ae3dd31eae3507ac0f0664c06820c4c571ee2afbc6d86d9bfc0cd266b4de66358326d39ef64fa51e26a8bbcdef8cf592496171ff671a74620fd5626889a94fd7
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
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
 )
-- 
cgit v1.2.3