From 218f0e20f6a9ef5f1188bf946305b542772bba1d Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Thu, 20 May 2021 07:03:47 +0200
Subject: [PATCH] Use separate install dir for different plugins

The service types are deprecated and not needed anymore when using the
JSON metadata. Instead install the different plugin types into dedicated
dirs, this way there is not additional filtering needed.
---
 events/x11/CMakeLists.txt            | 2 +-
 events/xdp/CMakeLists.txt            | 2 +-
 framebuffers/pipewire/CMakeLists.txt | 2 +-
 framebuffers/qt/CMakeLists.txt       | 2 +-
 framebuffers/xcb/CMakeLists.txt      | 2 +-
 krfb/eventsmanager.cpp               | 4 +---
 krfb/framebuffermanager.cpp          | 4 +---
 krfb/mainwindow.cpp                  | 5 +----
 8 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/events/x11/CMakeLists.txt b/events/x11/CMakeLists.txt
index c6ab0bc..a1af0e5 100644
--- a/events/x11/CMakeLists.txt
+++ b/events/x11/CMakeLists.txt
@@ -15,4 +15,4 @@ target_link_libraries (krfb_events_x11
                        krfbprivate
 )
 
-install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb)
+install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events)
diff --git a/events/xdp/CMakeLists.txt b/events/xdp/CMakeLists.txt
index 2383e19..206abed 100644
--- a/events/xdp/CMakeLists.txt
+++ b/events/xdp/CMakeLists.txt
@@ -23,5 +23,5 @@ target_link_libraries (krfb_events_xdp
 )
 
 install (TARGETS krfb_events_xdp
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events
 )
diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt
index cd7d9ce..205f7d4 100644
--- a/framebuffers/pipewire/CMakeLists.txt
+++ b/framebuffers/pipewire/CMakeLists.txt
@@ -49,5 +49,5 @@ target_link_libraries (krfb_framebuffer_pw
 )
 
 install (TARGETS krfb_framebuffer_pw
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )
diff --git a/framebuffers/qt/CMakeLists.txt b/framebuffers/qt/CMakeLists.txt
index 24776f2..703c7ec 100644
--- a/framebuffers/qt/CMakeLists.txt
+++ b/framebuffers/qt/CMakeLists.txt
@@ -28,5 +28,5 @@ target_link_libraries (krfb_framebuffer_qt
 )
 
 install (TARGETS krfb_framebuffer_qt
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )
diff --git a/framebuffers/xcb/CMakeLists.txt b/framebuffers/xcb/CMakeLists.txt
index 65c956d..b382046 100644
--- a/framebuffers/xcb/CMakeLists.txt
+++ b/framebuffers/xcb/CMakeLists.txt
@@ -32,5 +32,5 @@ target_link_libraries (krfb_framebuffer_xcb
 )
 
 install (TARGETS krfb_framebuffer_xcb
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )
diff --git a/krfb/eventsmanager.cpp b/krfb/eventsmanager.cpp
index aa23666..7baf5d4 100644
--- a/krfb/eventsmanager.cpp
+++ b/krfb/eventsmanager.cpp
@@ -64,9 +64,7 @@ void EventsManager::loadPlugins()
 {
     //qDebug();
 
-    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/events"));
-        });
+    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb/events"));
 
     QVectorIterator<KPluginMetaData> i(plugins);
     i.toBack();
diff --git a/krfb/framebuffermanager.cpp b/krfb/framebuffermanager.cpp
index 3a10e5e..d8950e4 100644
--- a/krfb/framebuffermanager.cpp
+++ b/krfb/framebuffermanager.cpp
@@ -63,9 +63,7 @@ void FrameBufferManager::loadPlugins()
 {
     //qDebug();
 
-    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
-        });
+    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb/framebuffer"));
 
     QVectorIterator<KPluginMetaData> i(plugins);
     i.toBack();
diff --git a/krfb/mainwindow.cpp b/krfb/mainwindow.cpp
index 14924f6..7dbbbf5 100644
--- a/krfb/mainwindow.cpp
+++ b/krfb/mainwindow.cpp
@@ -83,10 +83,7 @@ public:
     }
 
     void fillFrameBuffersCombo() {
-        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(
-                    QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
-        });
+        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb/framebuffer"));
         QSet<QString> unique;
         QVectorIterator<KPluginMetaData> i(plugins);
         i.toBack();