From 0d461b1cadf3f80560302d396c87f4877febd107 Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Mon, 9 May 2022 20:52:15 +0200
Subject: [PATCH] Port away from deprecated Plasma plugin macros

---
 app/packageplugins/indicator/CMakeLists.txt       | 8 +++-----
 app/packageplugins/indicator/indicatorpackage.cpp | 2 +-
 containmentactions/contextmenu/menu.cpp           | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/packageplugins/indicator/CMakeLists.txt b/app/packageplugins/indicator/CMakeLists.txt
index 13148261a..db690076d 100644
--- a/app/packageplugins/indicator/CMakeLists.txt
+++ b/app/packageplugins/indicator/CMakeLists.txt
@@ -1,8 +1,9 @@
 set(indicator_SRCS
-    indicatorpackage.cpp
+    
 )
 
-add_library(latte_packagestructure_indicator MODULE ${indicator_SRCS})
+kcoreaddons_add_plugin(latte_packagestructure_indicator SOURCES indicatorpackage.cpp INSTALL_NAMESPACE kpackage/packagestructure)
+set_target_properties(latte_packagestructure_indicator PROPERTIES OUTPUT_NAME latte_indicator)
 
 target_link_libraries(latte_packagestructure_indicator
    KF5::Declarative
@@ -12,7 +13,4 @@ target_link_libraries(latte_packagestructure_indicator
 
 kcoreaddons_desktop_to_json(latte_packagestructure_indicator latte-packagestructure-indicator.desktop)
 
-install(TARGETS latte_packagestructure_indicator DESTINATION ${KDE_INSTALL_PLUGINDIR}/kpackage/packagestructure)
-set_target_properties(latte_packagestructure_indicator PROPERTIES OUTPUT_NAME latte_indicator)
-
 install(FILES latte-indicator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
diff --git a/app/packageplugins/indicator/indicatorpackage.cpp b/app/packageplugins/indicator/indicatorpackage.cpp
index 9c518e632..47b217db3 100644
--- a/app/packageplugins/indicator/indicatorpackage.cpp
+++ b/app/packageplugins/indicator/indicatorpackage.cpp
@@ -36,6 +36,6 @@ void IndicatorPackage::initPackage(KPackage::Package *package)
 
 }
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(Latte::IndicatorPackage, "latte-packagestructure-indicator.json")
+K_PLUGIN_CLASS_WITH_JSON(Latte::IndicatorPackage, "latte-packagestructure-indicator.json")
 
 #include "indicatorpackage.moc"
diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
index da56c39c2..c64729bca 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -503,6 +503,6 @@ void Menu::quitApplication()
     }
 }
 
-K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(lattecontextmenu, Menu, "plasma-containmentactions-lattecontextmenu.json")
+K_PLUGIN_CLASS_WITH_JSON(Menu, "plasma-containmentactions-lattecontextmenu.json")
 
 #include "menu.moc"