[gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
commit: 1e88860433156d35f8e1c75d756a0d41276857f9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 30 14:02:54 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 30 14:02:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e888604 app-text/kjots: drop 5.1.0-r3 Signed-off-by: Andreas Sturmlechner 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.. --- 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" -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 - #include - -+#include -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include -+#else - #include -+#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 - #include - -+#include -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include -+#include -+#else - #include - #include -+#endif - #include - - #include -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 -+#include // for QT_VERSION_CHECK -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include -+#else - #include -+#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 -+#include -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#else - #include - #include - #include -@@ -50,7 +68,7 @@ - #include - #include - #include -- -+#endif - // Grantlee - #include - #include -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 - #include - -+#include -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 4
[gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
commit: 96a4aa33cb8bce42aa620ea5cdf65e5f73dd7b9e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 28 13:03:25 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 28 13:05:46 2022 +
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 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 ..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
+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
)
[gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
commit: 3b8279611688f3898c5b6c5e76e0062d7fbed123
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 9 00:32:48 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 9 00:33:39 2022 +
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 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 ..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
+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
+Date: Fri, 1 Apr 2022 08:00:34 +
+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
+ #include
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include
++#else
+ #include
++#endif
+
+ #include
+ #include
+diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp
+--- a/src/kjotswidget.cpp
b/src/kjotswidget.cpp
+@@ -34,8 +34,12 @@
+ #include
+
+ // Akonadi
+-#include
+ #include
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include
++#else
++#include
++#endif
+ #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+ #include
+ #include
+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
+ #include
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include
++#else
+ #include
++#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
+ #include
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include
++#else
+ #include
++#endif
+
+ #include
+ #include
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
)
[gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
commit: adbd03782c2bbd20bccf44822a10d390c3680936
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 20 13:52:58 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 20 13:53:24 2022 +
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 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 ..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
+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
+-#include
+ #include
+
++#include
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
++#include
++#endif
++
+ #include
+ #include
+ #include
+@@ -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 mBrowser;
+ KPIMTextEdit::SlideContainer mSliderContainer;
+ KPIMTextEdit::RichTextEditFindBar mFindBar;
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ KPIMTextEdit::TextToSpeechWidget mTextToSpeechWidget;
++#endif
+ };
+
+ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr browser,
QWidget *parent)
+@@ -56,11 +64,15 @@
KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr 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 ..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
[gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
commit: dd612ec49fd15ed7986e5c74a36f44fdf97cc2a9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Sep 20 08:16:15 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Sep 20 08:42:14 2020 +
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 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 000..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
+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
+ #include
+
+-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(
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
[gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/
commit: ddbdc7ce709c3f8af620e8d06f5847cbe73ec50e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 21 14:33:22 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 21 14:40:52 2020 +
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 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 000..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
+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(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(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 000..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
+
