diff options
Diffstat (limited to 'app-text/kjots')
| -rw-r--r-- | app-text/kjots/Manifest | 5 | ||||
| -rw-r--r-- | app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch | 272 | ||||
| -rw-r--r-- | app-text/kjots/files/kjots-5.1.0-implicit-dep.patch | 26 | ||||
| -rw-r--r-- | app-text/kjots/files/kjots-5.1.0-missing-lib.patch | 25 | ||||
| -rw-r--r-- | app-text/kjots/kjots-5.1.0-r1.ebuild (renamed from app-text/kjots/kjots-5.1.0.ebuild) | 13 |
5 files changed, 336 insertions, 5 deletions
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest index f85d89f17e26..11e071388f30 100644 --- a/app-text/kjots/Manifest +++ b/app-text/kjots/Manifest @@ -1,4 +1,7 @@ +AUX kjots-5.1.0-akonadi-21.12.0.patch 8215 BLAKE2B a192b70f325a84423b88144fdb5dc70a07b10c84cb0feb8faf74859fd1668f97db6972841bad74e313afba46c09cd2d882297cc72b1c8c00e9b5dfe68874fb75 SHA512 5487f7ea196479a64e72d8a8fe2f9f7ba7ed60c3932703795f0698325c737d08aff3c63d36ef60a9c66f2660f6c5318239c493db926d50a98df61256be0b9f65 +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-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.ebuild 1283 BLAKE2B 5d001a7d9f3bebd982ab6a4eef595a3f17f675c479863f04d57064fb220358f646608553ac2d6cfd501b09909ad1864916a09c238b6f774d47bef0dab10cc077 SHA512 1e7d7cfc3239c4ee568478697e9140f3e7ab6e0aac2e79aa826f0496881a6e3f2b21baf9c0f29e7360e983e9bb56a10bcad9ad8d6dc975bf02e0065a244b7db8 +EBUILD kjots-5.1.0-r1.ebuild 1415 BLAKE2B a1e6a7c83209627ec20b9f6a9b470964dbbb2d94f09e3950c11b6d7414538592c501f09f0aef808c87fe8f4194b9627a92f8759af47a534292e73719fd022e73 SHA512 c6708d59c260f9637d3fe653629810a94b564145c0d076d743aba934fc8ad008e8aeaf79d1f895ce3df0f49764b300a8afdfcd76bcca12ab7acbd7c5592fa7b7 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch new file mode 100644 index 000000000000..3f0c4e52779b --- /dev/null +++ b/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch @@ -0,0 +1,272 @@ +From 581548a1de9449efc0c77e9ac85c23066bac983e Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" <kossebau@kde.org> +Date: Wed, 8 Sep 2021 00:58:25 +0200 +Subject: [PATCH] Adapt to new Akonadi libraries includes using the C++ + namespace as prefix + +GIT_SILENT +--- + src/kjotsedit.cpp | 5 +++++ + src/kjotsmodel.cpp | 6 ++++++ + src/kjotsmodel.h | 6 ++++++ + src/kjotswidget.cpp | 20 +++++++++++++++++++- + src/kjotswidget.h | 5 +++++ + src/noteshared/notecreatorandselector.cpp | 7 +++++++ + src/noteshared/notecreatorandselector.h | 6 ++++++ + src/noteshared/notelockattribute.h | 6 ++++++ + src/noteshared/notepinattribute.h | 6 ++++++ + src/noteshared/standardnoteactionmanager.cpp | 8 ++++++++ + src/noteshared/standardnoteactionmanager.h | 9 +++++++-- + src/notesortproxymodel.cpp | 5 +++++ + 12 files changed, 86 insertions(+), 3 deletions(-) + +diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp +index f1d61bd..c20bc42 100644 +--- a/src/kjotsedit.cpp ++++ b/src/kjotsedit.cpp +@@ -33,7 +33,12 @@ + #include <KPIMTextEdit/RichTextComposerActions> + #include <KPIMTextEdit/RichTextComposerImages> + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/Item> ++#else + #include <AkonadiCore/Item> ++#endif + + #include "kjotslinkdialog.h" + #include "kjotsmodel.h" +diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp +index e35c94f..99ee14f 100644 +--- a/src/kjotsmodel.cpp ++++ b/src/kjotsmodel.cpp +@@ -13,8 +13,14 @@ + #include <QTextDocument> + #include <QIcon> + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/ChangeRecorder> ++#include <Akonadi/EntityDisplayAttribute> ++#else + #include <AkonadiCore/ChangeRecorder> + #include <AkonadiCore/EntityDisplayAttribute> ++#endif + #include <Akonadi/Notes/NoteUtils> + + #include <KMime/Message> +diff --git a/src/kjotsmodel.h b/src/kjotsmodel.h +index 71e0ca6..ec564a7 100644 +--- a/src/kjotsmodel.h ++++ b/src/kjotsmodel.h +@@ -10,7 +10,13 @@ + #ifndef KJOTSMODEL_H + #define KJOTSMODEL_H + ++#include <akonadi_version.h> ++#include <QtGlobal> // for QT_VERSION_CHECK ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/EntityTreeModel> ++#else + #include <AkonadiCore/EntityTreeModel> ++#endif + + class QTextDocument; + +diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp +index 3a3abd0..834fc33 100644 +--- a/src/kjotswidget.cpp ++++ b/src/kjotswidget.cpp +@@ -35,6 +35,24 @@ + + // Akonadi + #include <Akonadi/Notes/NoteUtils> ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/AttributeFactory> ++#include <Akonadi/CollectionCreateJob> ++#include <Akonadi/CollectionDeleteJob> ++#include <Akonadi/ChangeRecorder> ++#include <Akonadi/EntityDisplayAttribute> ++#include <Akonadi/EntityMimeTypeFilterModel> ++#include <Akonadi/Item> ++#include <Akonadi/ItemCreateJob> ++#include <Akonadi/ItemModifyJob> ++#include <Akonadi/ItemDeleteJob> ++#include <Akonadi/ItemFetchScope> ++#include <Akonadi/EntityOrderProxyModel> ++#include <Akonadi/EntityTreeView> ++#include <Akonadi/ETMViewStateSaver> ++#include <Akonadi/ControlGui> ++#else + #include <AkonadiCore/AttributeFactory> + #include <AkonadiCore/CollectionCreateJob> + #include <AkonadiCore/CollectionDeleteJob> +@@ -50,7 +68,7 @@ + #include <AkonadiWidgets/EntityTreeView> + #include <AkonadiWidgets/ETMViewStateSaver> + #include <AkonadiWidgets/ControlGui> +- ++#endif + // Grantlee + #include <grantlee/template.h> + #include <grantlee/engine.h> +diff --git a/src/kjotswidget.h b/src/kjotswidget.h +index 7fe91ed..00a41b5 100644 +--- a/src/kjotswidget.h ++++ b/src/kjotswidget.h +@@ -18,7 +18,12 @@ + #include <QAbstractItemDelegate> + #include <QPrinter> + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/Collection> ++#else + #include <AkonadiCore/Collection> ++#endif + + #include <grantlee/templateloader.h> + +diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp +index 2172cbf..6d58c83 100644 +--- a/src/noteshared/notecreatorandselector.cpp ++++ b/src/noteshared/notecreatorandselector.cpp +@@ -14,9 +14,16 @@ + + #include <KMime/Message> + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/EntityDisplayAttribute> ++#include <Akonadi/EntityTreeModel> ++#include <Akonadi/ItemCreateJob> ++#else + #include <AkonadiCore/EntityDisplayAttribute> + #include <AkonadiCore/EntityTreeModel> + #include <AkonadiCore/ItemCreateJob> ++#endif + #include <Akonadi/Notes/NoteUtils> + + #include "noteshared_debug.h" +diff --git a/src/noteshared/notecreatorandselector.h b/src/noteshared/notecreatorandselector.h +index 90055cf..986d042 100644 +--- a/src/noteshared/notecreatorandselector.h ++++ b/src/noteshared/notecreatorandselector.h +@@ -14,8 +14,14 @@ + #include <QItemSelectionModel> + #include <QTimer> + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/Collection> ++#include <Akonadi/Item> ++#else + #include <AkonadiCore/Collection> + #include <AkonadiCore/Item> ++#endif + + class KJob; + +diff --git a/src/noteshared/notelockattribute.h b/src/noteshared/notelockattribute.h +index 9bdd8a2..b0ee819 100644 +--- a/src/noteshared/notelockattribute.h ++++ b/src/noteshared/notelockattribute.h +@@ -11,7 +11,13 @@ + #ifndef KJOTS_LOCK_ATTRIBUTE_H + #define KJOTS_LOCK_ATTRIBUTE_H + ++#include <akonadi_version.h> ++#include <QtGlobal> // for QT_VERSION_CHECK ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/Attribute> ++#else + #include <AkonadiCore/Attribute> ++#endif + + namespace NoteShared + { +diff --git a/src/noteshared/notepinattribute.h b/src/noteshared/notepinattribute.h +index 3026dea..5f3903c 100644 +--- a/src/noteshared/notepinattribute.h ++++ b/src/noteshared/notepinattribute.h +@@ -9,7 +9,13 @@ + #ifndef NOTE_PIN_ATTRIBUTE_H + #define NOTE_PIN_ATTRIBUTE_H + ++#include <akonadi_version.h> ++#include <QtGlobal> // for QT_VERSION_CHECK ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/Attribute> ++#else + #include <AkonadiCore/Attribute> ++#endif + + namespace NoteShared + { +diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp +index a3f4b8b..2a2f4ce 100644 +--- a/src/noteshared/standardnoteactionmanager.cpp ++++ b/src/noteshared/standardnoteactionmanager.cpp +@@ -13,10 +13,18 @@ + #include <QColorDialog> + #include <QItemSelectionModel> + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/EntityDisplayAttribute> ++#include <Akonadi/EntityTreeModel> ++#include <Akonadi/CollectionModifyJob> ++#include <Akonadi/ItemModifyJob> ++#else + #include <AkonadiCore/EntityDisplayAttribute> + #include <AkonadiCore/EntityTreeModel> + #include <AkonadiCore/CollectionModifyJob> + #include <AkonadiCore/ItemModifyJob> ++#endif + #include <Akonadi/Notes/NoteUtils> + + #include <KXmlGui/KActionCollection> +diff --git a/src/noteshared/standardnoteactionmanager.h b/src/noteshared/standardnoteactionmanager.h +index fe80dae..6605820 100644 +--- a/src/noteshared/standardnoteactionmanager.h ++++ b/src/noteshared/standardnoteactionmanager.h +@@ -10,10 +10,15 @@ + #ifndef AKONADI_STANDARDNOTESACTIONMANAGER_H + #define AKONADI_STANDARDNOTESACTIONMANAGER_H + +-#include <AkonadiWidgets/StandardActionManager> +- + #include <QObject> + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/StandardActionManager> ++#else ++#include <AkonadiWidgets/StandardActionManager> ++#endif ++ + class QAction; + class KActionCollection; + class QItemSelectionModel; +diff --git a/src/notesortproxymodel.cpp b/src/notesortproxymodel.cpp +index 89def1c..dbe582f 100644 +--- a/src/notesortproxymodel.cpp ++++ b/src/notesortproxymodel.cpp +@@ -8,7 +8,12 @@ + + #include "notesortproxymodel.h" + ++#include <akonadi_version.h> ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/EntityTreeModel> ++#else + #include <AkonadiCore/EntityTreeModel> ++#endif + + #include "noteshared/notepinattribute.h" + +-- +GitLab + diff --git a/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch b/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch new file mode 100644 index 000000000000..b81bafc1889f --- /dev/null +++ b/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch @@ -0,0 +1,26 @@ +From 8803636bf4e0238d0f23bedebdcb4d1e6283ffb7 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 26 Apr 2021 17:09:51 +0200 +Subject: [PATCH] Make dependency on KI18n explicit + +It already pulled in by KParts, but we better not rely on that +--- + src/kontact_plugin/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt +index dec4b8b..f1d56ec 100644 +--- a/src/kontact_plugin/CMakeLists.txt ++++ b/src/kontact_plugin/CMakeLists.txt +@@ -13,7 +13,7 @@ set(kontact_kjots_PART_SRCS + ) + + add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS}) +-target_link_libraries(kontact_kjotsplugin KF5::KontactInterface) ++target_link_libraries(kontact_kjotsplugin KF5::I18n KF5::KontactInterface) + kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop) + + install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5) +-- +GitLab + diff --git a/app-text/kjots/files/kjots-5.1.0-missing-lib.patch b/app-text/kjots/files/kjots-5.1.0-missing-lib.patch new file mode 100644 index 000000000000..28418717d3be --- /dev/null +++ b/app-text/kjots/files/kjots-5.1.0-missing-lib.patch @@ -0,0 +1,25 @@ +From 3d3cee8caeec813802a1af54c14805203fb1ddf6 Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" <kossebau@kde.org> +Date: Tue, 7 Sep 2021 23:21:34 +0200 +Subject: [PATCH] noteshared: add missing library to link list + +GIT_SILENT +--- + src/noteshared/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/noteshared/CMakeLists.txt b/src/noteshared/CMakeLists.txt +index 5de60ab..6aa0b0a 100644 +--- a/src/noteshared/CMakeLists.txt ++++ b/src/noteshared/CMakeLists.txt +@@ -16,6 +16,7 @@ target_link_libraries(noteshared + Qt5::Core + Qt5::Widgets + KF5::I18n ++ KF5::AkonadiWidgets + KF5::AkonadiCore + KF5::AkonadiNotes + KF5::XmlGui +-- +GitLab + diff --git a/app-text/kjots/kjots-5.1.0.ebuild b/app-text/kjots/kjots-5.1.0-r1.ebuild index 933ed290e976..dd1910ad60f6 100644 --- a/app-text/kjots/kjots-5.1.0.ebuild +++ b/app-text/kjots/kjots-5.1.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 KDE_ORG_CATEGORY="pim" -KFMIN=5.77.0 +KFMIN=5.82.0 QTMIN=5.15.2 inherit ecm kde.org @@ -45,4 +45,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES+=( "${FILESDIR}/${P}-unused-dep.patch" ) +PATCHES=( + "${FILESDIR}/${P}-unused-dep.patch" + "${FILESDIR}/${P}-implicit-dep.patch" + "${FILESDIR}/${P}-missing-lib.patch" + "${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580 +) |