diff options
Diffstat (limited to 'app-text/kjots')
| -rw-r--r-- | app-text/kjots/Manifest | 9 | ||||
| -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-akonadi-22.04.0.patch | 87 | ||||
| -rw-r--r-- | app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch | 47 | ||||
| -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/files/kjots-5.1.0-speech-optional.patch | 82 | ||||
| -rw-r--r-- | app-text/kjots/files/kjots-5.1.0-unused-dep.patch | 45 | ||||
| -rw-r--r-- | app-text/kjots/kjots-5.1.0-r3.ebuild | 58 |
9 files changed, 0 insertions, 651 deletions
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest index 83e92be81ee5..24b417c0ce94 100644 --- a/app-text/kjots/Manifest +++ b/app-text/kjots/Manifest @@ -1,12 +1,3 @@ -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-akonadi-22.08.0.patch 1674 BLAKE2B abfbe519440006d0596effa9163f29bf3ebcd65490f928da0a0a531d4c4afe0158e1bd0c6df531ebaa1da66c3b98a5d11918b63c388cdb4a2e403cc6488fdc0f SHA512 666006761b979869efa4d76d2c3240d7dfcfea5e56d727501e4d5ef75510c230499bd09190cb1a70f85eae4d4bcf64471834d48c7c8e3adedd313ce4cd53e0c0 -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 DIST kjots-5.1.1.tar.xz 232816 BLAKE2B e90f0d4964a939898bd484ce691a0586725705d27e65af513ebfcd7b2bd1eec731e2374e550e92def736c72bad12e272c9cae1c32eabda67a2c1c45cb6655b69 SHA512 b0b4c3f9e11d5cc91b6667bc0483e1e3c62535473e99abbe6fb8e5e4519c1a2b72372de42f63fa2f6e730b40e03fcbc99cd0e189084f0122bfccf45185d2b088 -EBUILD kjots-5.1.0-r3.ebuild 1632 BLAKE2B 03c08e13fbffc35a191468b994df1e3572c2af0c325a300f998e9142a510698e3bab43b44f5f086b66d395cdc75ce6eb852d3b8e06be6d1298b7085b1b88e9d4 SHA512 83e3c63131c7e74192583154758d4aac76f21927b9b99b330cc61f00366392eda3074395f5f2316ad5f09419be2ca9aef5608b652aaf265d42185987b50f1d32 EBUILD kjots-5.1.1.ebuild 1436 BLAKE2B 94ee61625ca72478acea9d2a11c2fac14210367318965dedee64f011d78c6844a0f8ad76099aa524add446b8820a44303351eb364577f9de9eccdb5eb3ae6a77 SHA512 cc00dca993b55f9c2cb86577fdae40625ebbc432abcc87abead5f955c5ad14a71977a8b2a2a828806013187c7bb47af317652c7f3bf00b72a07764fad6a68004 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb 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 deleted file mode 100644 index 3f0c4e52779b..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch +++ /dev/null @@ -1,272 +0,0 @@ -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-akonadi-22.04.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch deleted file mode 100644 index a5ef2cc2cdf9..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch +++ /dev/null @@ -1,87 +0,0 @@ -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/files/kjots-5.1.0-akonadi-22.08.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch deleted file mode 100644 index fc5240105b02..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 85121754c862417e872048ae2f85e9b9fe2ddc7a Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 14 Jul 2022 14:27:55 +0200 -Subject: [PATCH] Adapt to new KontactInterface::Plugin ctor - ---- - src/kontact_plugin/kjots_plugin.cpp | 5 +++++ - src/kontact_plugin/kjots_plugin.h | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp -index 1146ab3..c75faac 100644 ---- a/src/kontact_plugin/kjots_plugin.cpp -+++ b/src/kontact_plugin/kjots_plugin.cpp -@@ -40,8 +40,13 @@ - - EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json") - -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41) -+KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &/*args*/) -+ : KontactInterface::Plugin(core, core, md, "kjots") -+#else - KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &/*args*/) - : KontactInterface::Plugin(core, core, "kjots") -+#endif - { - setComponentName(QStringLiteral("kjots"), i18n("KJots")); - -diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h -index 28a793b..03ff500 100644 ---- a/src/kontact_plugin/kjots_plugin.h -+++ b/src/kontact_plugin/kjots_plugin.h -@@ -34,7 +34,11 @@ class KJotsPlugin : public KontactInterface::Plugin - Q_OBJECT - - public: -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41) -+ KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &); -+#else - KJotsPlugin(KontactInterface::Core *core, const QVariantList &); -+#endif - - int weight() const override - { --- -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 deleted file mode 100644 index b81bafc1889f..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 28418717d3be..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-missing-lib.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/files/kjots-5.1.0-speech-optional.patch b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch deleted file mode 100644 index 95c3309bd5b9..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-speech-optional.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c552b158e46ccdefc5c8382911aca907e177d63d Mon Sep 17 00:00:00 2001 -From: Igor Poboiko <igor.poboiko@gmail.com> -Date: Sat, 19 Mar 2022 15:44:50 +0100 -Subject: [PATCH] Allow compiling without KPIMTextEdit/TextToSpeech - ---- - src/kjotsbrowser.cpp | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/src/kjotsbrowser.cpp b/src/kjotsbrowser.cpp -index fd6e6dd..8864f79 100644 ---- a/src/kjotsbrowser.cpp -+++ b/src/kjotsbrowser.cpp -@@ -15,9 +15,13 @@ - #include "kjotsmodel.h" - - #include <KPIMTextEdit/RichTextEditFindBar> --#include <KPIMTextEdit/TextToSpeechWidget> - #include <KPIMTextEdit/SlideContainer> - -+#include <kpimtextedit/kpimtextedit-texttospeech.h> -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH -+#include <KPIMTextEdit/TextToSpeechWidget> -+#endif -+ - #include <QHelpEvent> - #include <QToolTip> - #include <QVBoxLayout> -@@ -37,14 +41,18 @@ public: - : mBrowser(std::move(browser)) - , mSliderContainer(widget) - , mFindBar(mBrowser.get(), &mSliderContainer) -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - , mTextToSpeechWidget(widget) -+#endif - { - } - - std::unique_ptr<KJotsBrowser> mBrowser; - KPIMTextEdit::SlideContainer mSliderContainer; - KPIMTextEdit::RichTextEditFindBar mFindBar; -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - KPIMTextEdit::TextToSpeechWidget mTextToSpeechWidget; -+#endif - }; - - KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QWidget *parent) -@@ -56,11 +64,15 @@ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QW - d->mFindBar.setHideWhenClose(false); - - connect(&d->mFindBar, &KPIMTextEdit::RichTextEditFindBar::hideFindBar, this, &KJotsBrowserWidget::slotHideFindBar); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - connect(d->mBrowser.get(), &KJotsBrowser::say, &d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); -+#endif - - QVBoxLayout *lay = new QVBoxLayout(this); - lay->setContentsMargins(0, 0, 0, 0); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - lay->addWidget(&d->mTextToSpeechWidget); -+#endif - lay->addWidget(d->mBrowser.get()); - lay->addWidget(&d->mSliderContainer); - } -@@ -129,6 +141,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event) - popup->addSeparator(); - popup->addAction(m_actionCollection->action(QString::fromLatin1(KStandardAction::name(KStandardAction::Find)))); - popup->addSeparator(); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - if (!document()->isEmpty() && KPIMTextEdit::TextToSpeech::self()->isReady()) { - QAction *speakAction = popup->addAction(i18nc("@info:action", "Speak Text")); - speakAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-text-to-speech"))); -@@ -137,6 +150,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event) - Q_EMIT say(text); - }); - } -+#endif - popup->exec(event->globalPos()); - delete popup; - } --- -GitLab - diff --git a/app-text/kjots/files/kjots-5.1.0-unused-dep.patch b/app-text/kjots/files/kjots-5.1.0-unused-dep.patch deleted file mode 100644 index 466bc3c62a2a..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-unused-dep.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1aa82d97c3140ebb93e642c48d187d37cea2e537 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Sat, 20 Feb 2021 22:00:41 +0100 -Subject: [PATCH] Drop unused libkdepim dependency - ---- - CMakeLists.txt | 2 -- - src/CMakeLists.txt | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d79806..5204908 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,6 @@ set(KDEPIMLIBS_LIB_VERSION "5.1.0") - set(KMIME_LIB_VERSION "4.87.0") - set(KPIMTEXTEDIT_LIB_VERSION "5.14.44") - set(KONTACTINTERFACE_LIB_VERSION "4.82.0") --set(LIBKDEPIM_LIB_VERSION "5.14.1") - - #Qt Packages - set(QT_REQUIRED_VERSION "5.6.0") -@@ -45,7 +44,6 @@ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED) --find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) - - find_package(Grantlee5 "5.0" CONFIG REQUIRED) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a512dab..e66e805 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -49,7 +49,6 @@ target_link_libraries(kjots_common - KF5::PimTextEdit - KF5::XmlGui - KF5::KIOWidgets -- KF5::Libkdepim - Grantlee5::Templates - Grantlee5::TextDocument - ) --- -GitLab - diff --git a/app-text/kjots/kjots-5.1.0-r3.ebuild b/app-text/kjots/kjots-5.1.0-r3.ebuild deleted file mode 100644 index 19a1d1ab13f5..000000000000 --- a/app-text/kjots/kjots-5.1.0-r3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_CATEGORY="pim" -KFMIN=5.102.0 -QTMIN=5.15.5 -inherit ecm kde.org - -DESCRIPTION="Note taking utility by KDE" -HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="speech" - -DEPEND=" - dev-libs/grantlee:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/akonadi-22.08.3:5 - >=kde-apps/akonadi-notes-22.08.3:5 - >=kde-apps/kmime-22.08.3:5 - >=kde-apps/kontactinterface-22.08.3:5 - >=kde-apps/kpimtextedit-22.08.3:5[speech(+)=] - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=kde-apps/kdepim-runtime-22.08.3:5 -" - -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 - "${FILESDIR}/${P}-speech-optional.patch" # bug 835128 - "${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272 - "${FILESDIR}/${P}-akonadi-22.08.0.patch" # bug 867082 -) |