* [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
@ 2020-04-21 14:41 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-04-21 14:41 UTC (permalink / raw
To: gentoo-commits
commit: ddbdc7ce709c3f8af620e8d06f5847cbe73ec50e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 14:33:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 14:40:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbdc7ce
app-text/kjots: Adapt the code to >=kde-frameworks/kbookmarks-5.69
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=384000
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kjots-5.0.2-kf5bookmarks-5.69.patch | 67 ++++++++++++++++++++++
app-text/kjots/kjots-5.0.2-r1.ebuild | 49 ++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch b/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch
new file mode 100644
index 00000000000..63bda683122
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch
@@ -0,0 +1,67 @@
+From ca6f4b963e83ed91cc7314e1b60fe6607b61b53e Mon Sep 17 00:00:00 2001
+From: Igor Poboiko <igor.poboiko@gmail.com>
+Date: Sun, 12 Apr 2020 17:55:24 +0300
+Subject: [KJots] Fix bookmarks actions
+
+Summary:
+This patch ports KJots from deprecated `KBookmarksMenu` API (see {D25660}).
+
+On my machine, it also fixes a crash (`bm_action` was null for some reason,
+I did not investigate it though).
+
+It also fixes the shortcuts collision (`action->setShortcut` was not enough,
+one also needs to run `actionCollection->setDefaultShortcut`).
+
+BUG: 384000
+
+Test Plan:
+1) Start KJots
+2) It don't crash, and `Ambiguous shortcuts` dialog does not appear)
+3) Open `Bookmarks` menu, the shortcut is `Ctrl+Shift+B`.
+
+Reviewers: dvratil
+
+Reviewed By: dvratil
+
+Subscribers: winterz, kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D28775
+---
+ src/kjotswidget.cpp | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
+index 865129b..e343bbd 100644
+--- a/src/kjotswidget.cpp
++++ b/src/kjotswidget.cpp
+@@ -353,17 +353,20 @@ KJotsWidget::KJotsWidget(QWidget *parent, KXMLGUIClient *xmlGuiClient, Qt::Windo
+ bookmarkMenu = actionCollection->add<KActionMenu>(QLatin1String("bookmarks"));
+ bookmarkMenu->setText(i18n("&Bookmarks"));
+ KJotsBookmarks *bookmarks = new KJotsBookmarks(treeview);
+- /*KBookmarkMenu *bmm =*/ new KBookmarkMenu(
++ KBookmarkMenu *bmm = new KBookmarkMenu(
+ KBookmarkManager::managerForFile(
+ QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).first() + QStringLiteral("/kjots/bookmarks.xml"),
+ QStringLiteral("kjots")),
+- bookmarks, bookmarkMenu->menu(), actionCollection);
++ bookmarks, bookmarkMenu->menu());
+
+ // "Add bookmark" and "make text bold" actions have conflicting shortcuts (ctrl + b)
+ // Make add_bookmark use ctrl+shift+b to resolve that.
+- QAction *bm_action = qobject_cast<QAction *>(actionCollection->action(QLatin1String("add_bookmark")));
+- Q_ASSERT(bm_action);
+- bm_action->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B);
++ QAction *bm_action = bmm->addBookmarkAction();
++ actionCollection->addAction(QStringLiteral("add_bookmark"), bm_action);
++ actionCollection->setDefaultShortcut(bm_action, Qt::CTRL | Qt::SHIFT | Qt::Key_B);
++ actionCollection->addAction(QStringLiteral("edit_bookmark"), bmm->editBookmarksAction());
++ actionCollection->addAction(QStringLiteral("add_bookmarks_list"), bmm->bookmarkTabsAsFolderAction());
++
+
+ KStandardAction::find(this, SLOT(onShowSearch()), actionCollection);
+ action = KStandardAction::findNext(this, SLOT(onRepeatSearch()), actionCollection);
+--
+cgit v1.1
+
diff --git a/app-text/kjots/kjots-5.0.2-r1.ebuild b/app-text/kjots/kjots-5.0.2-r1.ebuild
new file mode 100644
index 00000000000..841544075ce
--- /dev/null
+++ b/app-text/kjots/kjots-5.0.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Note taking utility by KDE"
+HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# drop kbookmarks subslot operator when KFMIN >= 5.69.0
+DEPEND="
+ dev-libs/grantlee:5
+ dev-libs/libxslt
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-19.04.3:5
+ >=kde-apps/akonadi-notes-19.04.3:5
+ >=kde-apps/kmime-19.04.3:5
+ >=kde-apps/kontactinterface-19.04.3:5
+ >=kde-apps/kpimtextedit-19.04.3:5
+ >=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/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+ !app-text/kjots:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" ) # KDE-Bug 384000
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
@ 2020-09-20 8:42 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-09-20 8:42 UTC (permalink / raw
To: gentoo-commits
commit: dd612ec49fd15ed7986e5c74a36f44fdf97cc2a9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 08:16:15 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 08:42:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd612ec4
app-text/kjots: Fix build with >=kde-apps/kontactinterface-20.08
- Raise minimum KDE PIM dependency to 20.08
- Raise minimum KDE Frameworks dependency to 5.70 and drop obsolete slot op
- Drop obsolete blocker
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kjots-5.0.2-kontactinterface-20.08.patch | 148 +++++++++++++++++++++
app-text/kjots/kjots-5.0.2-r2.ebuild | 49 +++++++
2 files changed, 197 insertions(+)
diff --git a/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch b/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
new file mode 100644
index 00000000000..608a50d9856
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
@@ -0,0 +1,148 @@
+From bcf49fb95bee12bbc4bef0578285ad296deafcae Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 24 Apr 2020 01:25:43 +0200
+Subject: [PATCH] Install the kontact plugin into kontact5, with JSON metadata.
+
+Summary: This will allow kontact to use KPluginLoader one day.
+
+It also fixes compilation with current kontactinterface API.
+
+Test Plan:
+rm $prefix/lib64/plugins/kontact_zanshinplugin.so ; make install
+kontact still finds the zanshin plugin
+
+The same steps (other than old-kontact-interface compatibility) were already
+pushed to all other kontact plugins.
+
+This commit is very similar to https://phabricator.kde.org/D28847
+and its predecessor commit, in zanshin.
+---
+ src/kontact_plugin/CMakeLists.txt | 11 ++++++++-
+ src/kontact_plugin/kjots_plugin.cpp | 34 ++++++++++++++++++++------
+ src/kontact_plugin/kjots_plugin.h | 5 ++++
+ src/kontact_plugin/kjotsplugin.desktop | 2 +-
+ 4 files changed, 43 insertions(+), 9 deletions(-)
+
+diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt
+index 8a6b5e1..dec4b8b 100644
+--- a/src/kontact_plugin/CMakeLists.txt
++++ b/src/kontact_plugin/CMakeLists.txt
+@@ -1,13 +1,22 @@
+ include_directories(${kjots_SOURCE_DIR}/src)
+
++# TODO: remove once kontactinterface 5.14.42 is required
++if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
++ # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
++ # 3.10+ lets us provide more macro names that require automoc.
++ # KF5 >= 5.42 takes care itself of adding its macros in its cmake config files
++ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "EXPORT_KONTACT_PLUGIN_WITH_JSON")
++endif()
++
+ set(kontact_kjots_PART_SRCS
+ kjots_plugin.cpp
+ )
+
+ add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS})
+ target_link_libraries(kontact_kjotsplugin KF5::KontactInterface)
++kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop)
+
+-install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
++install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
+ install(FILES kjotsplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
+ install(FILES kjots.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
+
+diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp
+index 66e7ed5..b74d601 100644
+--- a/src/kontact_plugin/kjots_plugin.cpp
++++ b/src/kontact_plugin/kjots_plugin.cpp
+@@ -33,7 +33,25 @@
+ #include <QIcon>
+ #include <QStandardPaths>
+
+-EXPORT_KONTACT_PLUGIN(KJotsPlugin, kjots)
++#if KONTACTINTERFACE_VERSION < QT_VERSION_CHECK(5, 14, 42)
++/**
++ Exports Kontact plugin.
++ @param pluginclass the class to instanciate (must derive from KontactInterface::Plugin
++ @param jsonFile filename of the JSON file, generated from a .desktop file
++ */
++#define EXPORT_KONTACT_PLUGIN_WITH_JSON( pluginclass, jsonFile ) \
++ class Instance \
++ { \
++ public: \
++ static QObject *createInstance( QWidget *, QObject *parent, const QVariantList &list ) \
++ { return new pluginclass( static_cast<KontactInterface::Core*>( parent ), list ); } \
++ }; \
++ K_PLUGIN_FACTORY_WITH_JSON( KontactPluginFactory, jsonFile, registerPlugin< pluginclass > \
++ ( QString(), Instance::createInstance ); ) \
++ K_EXPORT_PLUGIN_VERSION(KONTACT_PLUGIN_VERSION)
++#endif
++
++EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json")
+
+ KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &)
+ : KontactInterface::Plugin(core, core, "kjots")
+@@ -63,15 +81,17 @@ QStringList KJotsPlugin::invisibleToolbarActions() const
+ return { QStringLiteral("new_page"), QStringLiteral("new_book") };
+ }
+
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++KParts::Part *KJotsPlugin::createPart()
++{
++ return loadPart();
++}
++#else
+ KParts::ReadOnlyPart *KJotsPlugin::createPart()
+ {
+- KParts::ReadOnlyPart *part = loadPart();
+- if (!part) {
+- return Q_NULLPTR;
+- }
+-
+- return part;
++ return loadPart();
+ }
++#endif
+
+ QStringList KJotsPlugin::configModules() const
+ {
+diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h
+index cd62373..4945d25 100644
+--- a/src/kontact_plugin/kjots_plugin.h
++++ b/src/kontact_plugin/kjots_plugin.h
+@@ -24,6 +24,7 @@
+ #define KJOTS_PLUGIN_H
+
+ #include <KontactInterface/UniqueAppHandler>
++#include <kontactinterface_version.h>
+
+ namespace KontactInterface
+ {
+@@ -62,7 +63,11 @@ public:
+ QStringList invisibleToolbarActions() const Q_DECL_OVERRIDE;
+
+ protected:
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++ KParts::Part *createPart() override;
++#else
+ KParts::ReadOnlyPart *createPart() Q_DECL_OVERRIDE;
++#endif
+ KontactInterface::UniqueAppWatcher *mUniqueAppWatcher;
+
+ private:
+diff --git a/src/kontact_plugin/kjotsplugin.desktop b/src/kontact_plugin/kjotsplugin.desktop
+index 1339753..d5a198f 100644
+--- a/src/kontact_plugin/kjotsplugin.desktop
++++ b/src/kontact_plugin/kjotsplugin.desktop
+@@ -3,7 +3,7 @@ Type=Service
+ Icon=kjots
+ X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
+
+-X-KDE-Library=kontact_kjotsplugin
++X-KDE-Library=kontact5/kontact_kjotsplugin
+ X-KDE-KontactPluginVersion=10
+ X-KDE-KontactPartLibraryName=kjotspart
+ X-KDE-KontactPartExecutableName=kjots
+--
+GitLab
+
diff --git a/app-text/kjots/kjots-5.0.2-r2.ebuild b/app-text/kjots/kjots-5.0.2-r2.ebuild
new file mode 100644
index 00000000000..07aaf94d7b1
--- /dev/null
+++ b/app-text/kjots/kjots-5.0.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.70.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Note taking utility by KDE"
+HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/grantlee:5
+ dev-libs/libxslt
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-20.08.1:5
+ >=kde-apps/akonadi-notes-20.08.1:5
+ >=kde-apps/kmime-20.08.1:5
+ >=kde-apps/kontactinterface-20.08.1:5
+ >=kde-apps/kpimtextedit-20.08.1:5
+ >=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/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES+=(
+ "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # KDE-Bug 384000
+ "${FILESDIR}/${P}-kontactinterface-20.08.patch"
+)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
@ 2022-03-20 13:53 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-03-20 13:53 UTC (permalink / raw
To: gentoo-commits
commit: adbd03782c2bbd20bccf44822a10d390c3680936
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 13:52:58 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 13:53:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adbd0378
app-text/kjots: Add IUSE speech
Closes: https://bugs.gentoo.org/835128
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kjots/files/kjots-5.1.0-speech-optional.patch | 82 ++++++++++++++++++++++
app-text/kjots/kjots-5.1.0-r2.ebuild | 54 ++++++++++++++
app-text/kjots/metadata.xml | 3 +
3 files changed, 139 insertions(+)
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
new file mode 100644
index 000000000000..95c3309bd5b9
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch
@@ -0,0 +1,82 @@
+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/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild
new file mode 100644
index 000000000000..d7b50e76ebf6
--- /dev/null
+++ b/app-text/kjots/kjots-5.1.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
+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 ~x86"
+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-20.12.2:5
+ >=kde-apps/akonadi-notes-20.12.2:5
+ >=kde-apps/kmime-20.12.2:5
+ >=kde-apps/kontactinterface-20.12.2:5
+ >=kde-apps/kpimtextedit-20.12.2: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}"
+
+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
+)
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/app-text/kjots/metadata.xml
+++ b/app-text/kjots/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
+ <use>
+ <flag name="speech">Enable text-to-speech support</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
@ 2022-05-09 0:34 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-05-09 0:34 UTC (permalink / raw
To: gentoo-commits
commit: 3b8279611688f3898c5b6c5e76e0062d7fbed123
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 00:32:48 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 9 00:33:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b827961
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 <AT> gentoo.org>
.../kjots/files/kjots-5.1.0-akonadi-22.04.0.patch | 87 ++++++++++++++++++++++
app-text/kjots/kjots-5.1.0-r2.ebuild | 1 +
2 files changed, 88 insertions(+)
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
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
@ 2022-08-28 13:05 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-08-28 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 96a4aa33cb8bce42aa620ea5cdf65e5f73dd7b9e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 13:03:25 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 13:05:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a4aa33
app-text/kjots: Fix build with >=akonadi-22.08.0
Upstream commit 85121754c862417e872048ae2f85e9b9fe2ddc7a
Closes: https://bugs.gentoo.org/867082
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kjots/files/kjots-5.1.0-akonadi-22.08.0.patch | 47 ++++++++++++++++++++++
app-text/kjots/kjots-5.1.0-r2.ebuild | 1 +
2 files changed, 48 insertions(+)
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
new file mode 100644
index 000000000000..fc5240105b02
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch
@@ -0,0 +1,47 @@
+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/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild
index 7ef5fe968253..ade68829883b 100644
--- a/app-text/kjots/kjots-5.1.0-r2.ebuild
+++ b/app-text/kjots/kjots-5.1.0-r2.ebuild
@@ -52,4 +52,5 @@ PATCHES=(
"${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
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
@ 2023-04-30 14:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-04-30 14:04 UTC (permalink / raw
To: gentoo-commits
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
-)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-30 14:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-20 13:53 [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-04-30 14:04 Andreas Sturmlechner
2022-08-28 13:05 Andreas Sturmlechner
2022-05-09 0:34 Andreas Sturmlechner
2020-09-20 8:42 Andreas Sturmlechner
2020-04-21 14:41 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox