public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
Date: Sun, 30 Apr 2023 14:04:58 +0000 (UTC)	[thread overview]
Message-ID: <1682863374.1e88860433156d35f8e1c75d756a0d41276857f9.asturm@gentoo> (raw)

commit:     1e88860433156d35f8e1c75d756a0d41276857f9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 14:02:54 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 14:02:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e888604

app-text/kjots: drop 5.1.0-r3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/kjots/Manifest                            |   1 -
 .../kjots/files/kjots-5.1.0-akonadi-21.12.0.patch  | 272 ---------------------
 .../kjots/files/kjots-5.1.0-akonadi-22.04.0.patch  |  87 -------
 .../kjots/files/kjots-5.1.0-akonadi-22.08.0.patch  |  47 ----
 .../kjots/files/kjots-5.1.0-implicit-dep.patch     |  26 --
 app-text/kjots/files/kjots-5.1.0-missing-lib.patch |  25 --
 .../kjots/files/kjots-5.1.0-speech-optional.patch  |  82 -------
 app-text/kjots/files/kjots-5.1.0-unused-dep.patch  |  45 ----
 app-text/kjots/kjots-5.1.0-r3.ebuild               |  58 -----
 9 files changed, 643 deletions(-)

diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index 6553e28411e3..27a4f377995e 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,2 +1 @@
-DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
 DIST kjots-5.1.1.tar.xz 232816 BLAKE2B e90f0d4964a939898bd484ce691a0586725705d27e65af513ebfcd7b2bd1eec731e2374e550e92def736c72bad12e272c9cae1c32eabda67a2c1c45cb6655b69 SHA512 b0b4c3f9e11d5cc91b6667bc0483e1e3c62535473e99abbe6fb8e5e4519c1a2b72372de42f63fa2f6e730b40e03fcbc99cd0e189084f0122bfccf45185d2b088

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
-)


             reply	other threads:[~2023-04-30 14:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-30 14:04 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-08-28 13:05 [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/ Andreas Sturmlechner
2022-05-09  0:34 Andreas Sturmlechner
2022-03-20 13:53 Andreas Sturmlechner
2020-09-20  8:42 Andreas Sturmlechner
2020-04-21 14:41 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1682863374.1e88860433156d35f8e1c75d756a0d41276857f9.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox