[neon/extras/kjots/Neon/release] debian: Fix compilation with KDE Apps 20.08 (Closes: #972226)
Norbert Preining
null at kde.org
Wed Jul 27 16:05:44 BST 2022
Git commit 4f15c14bcdb90947d2979ef6491aa4c91836f047 by Norbert Preining.
Committed on 15/10/2020 at 03:17.
Pushed by jriddell into branch 'Neon/release'.
Fix compilation with KDE Apps 20.08 (Closes: #972226)
patch taken from upstream kjots
M +6 -0 debian/changelog
A +137 -0 debian/patches/apps2008-compat-upstream-bcf49fb9.patch
A +1 -0 debian/patches/series
https://invent.kde.org/neon/extras/kjots/commit/4f15c14bcdb90947d2979ef6491aa4c91836f047
diff --git a/debian/changelog b/debian/changelog
index a4b7aa0..cab67da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kjots (4:5.0.2-3) UNRELEASED; urgency=medium
+
+ * Fix compilation with KDE Apps 20.08 (Closes: #972226)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 15 Oct 2020 12:16:26 +0900
+
kjots (4:5.0.2-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/apps2008-compat-upstream-bcf49fb9.patch b/debian/patches/apps2008-compat-upstream-bcf49fb9.patch
new file mode 100644
index 0000000..2d182e4
--- /dev/null
+++ b/debian/patches/apps2008-compat-upstream-bcf49fb9.patch
@@ -0,0 +1,137 @@
+From bcf49fb95bee12bbc4bef0578285ad296deafcae Mon Sep 17 00:00:00 2001
+From: David Faure <faure at 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(-)
+
+--- 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)
+
+--- 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")
+@@ -67,15 +85,17 @@ QStringList KJotsPlugin::invisibleToolba
+ 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
+ {
+--- 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
+ {
+@@ -63,7 +64,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:
+--- 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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6c42d49
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+apps2008-compat-upstream-bcf49fb9.patch
More information about the Neon-commits
mailing list