Commit 928863dd authored by David Faure's avatar David Faure
Browse files

akregator: install kontactplugin into kontact5, with JSON metadata.

Summary: This will allow kontact to use KPluginLoader one day.

Test Plan: make uninstall, apply patch, make install, kontact loads akregator plugin

Reviewers: winterz, mlaurent

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28610
parent 13a52fcc
...@@ -41,7 +41,7 @@ set(KDEPIM_LIB_SOVERSION "5") ...@@ -41,7 +41,7 @@ set(KDEPIM_LIB_SOVERSION "5")
set(QT_REQUIRED_VERSION "5.12.0") set(QT_REQUIRED_VERSION "5.12.0")
set(KONTACTINTERFACE_LIB_VERSION "5.14.41") set(KONTACTINTERFACE_LIB_VERSION "5.14.42")
set(KPIMTEXTEDIT_LIB_VERSION "5.14.40") set(KPIMTEXTEDIT_LIB_VERSION "5.14.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.14.40") set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.14.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.14.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.14.40")
......
...@@ -13,9 +13,11 @@ add_library(kontact_akregatorplugin MODULE ${kontact_akregator_PART_SRCS}) ...@@ -13,9 +13,11 @@ add_library(kontact_akregatorplugin MODULE ${kontact_akregator_PART_SRCS})
target_link_libraries(kontact_akregatorplugin KF5::KontactInterface) target_link_libraries(kontact_akregatorplugin KF5::KontactInterface)
kcoreaddons_desktop_to_json(kontact_akregatorplugin akregatorplugin.desktop)
########### install files ############### ########### install files ###############
install(TARGETS kontact_akregatorplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}) install(TARGETS kontact_akregatorplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(FILES akregatorplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact) install(FILES akregatorplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <QIcon> #include <QIcon>
#include <QStandardPaths> #include <QStandardPaths>
EXPORT_KONTACT_PLUGIN(AkregatorPlugin, akregator) EXPORT_KONTACT_PLUGIN_WITH_JSON(AkregatorPlugin, "akregatorplugin.json")
AkregatorPlugin::AkregatorPlugin(KontactInterface::Core *core, const QVariantList &) AkregatorPlugin::AkregatorPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "akregator") : KontactInterface::Plugin(core, core, "akregator")
......
...@@ -3,7 +3,7 @@ Type=Service ...@@ -3,7 +3,7 @@ Type=Service
Icon=view-pim-news Icon=view-pim-news
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
X-KDE-Library=kontact_akregatorplugin X-KDE-Library=kontact5/kontact_akregatorplugin
X-KDE-KontactPluginVersion=10 X-KDE-KontactPluginVersion=10
X-KDE-KontactPartLibraryName=akregatorpart X-KDE-KontactPartLibraryName=akregatorpart
X-KDE-KontactPartExecutableName=akregator X-KDE-KontactPartExecutableName=akregator
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment