From 94ffee00f78f4b13d513ca237d0a18e5a1bcb6a2 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Thu, 18 Jan 2018 19:55:11 +0100
Subject: [PATCH] Add KSysguard recipe

Also, clean up/simplify the file patterns a bit.
---
 classes/cmake_plasma.bbclass                  |  2 ++
 recipes-plasma/discover.inc                   |  1 -
 recipes-plasma/kde-cli-tools.inc              |  3 --
 recipes-plasma/ksysguard.inc                  | 32 +++++++++++++++++++
 recipes-plasma/ksysguard_5.11.5.bb            |  2 ++
 recipes-plasma/kwin.inc                       |  8 ++---
 recipes-plasma/libksysguard.inc               |  1 +
 recipes-plasma/packagegroups/plasma-mobile.bb |  1 +
 recipes-plasma/plasma-workspace.inc           |  8 ++---
 9 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 recipes-plasma/ksysguard.inc
 create mode 100644 recipes-plasma/ksysguard_5.11.5.bb

diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass
index 7cd67bc..5077ea1 100644
--- a/classes/cmake_plasma.bbclass
+++ b/classes/cmake_plasma.bbclass
@@ -24,6 +24,7 @@ do_compile_prepend() {
 }
 
 FILES_${PN} += " \
+    ${libdir}/libkdeinit5_*.so \
     ${libdir}/kconf_update_bin/* \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/*/*.so \
@@ -31,6 +32,7 @@ FILES_${PN} += " \
     ${datadir}/config.kcfg/*.kcfg \
     ${datadir}/dbus-1/services/*.service \
     ${datadir}/dbus-1/system-services/*.service \
+    ${datadir}/icons/hicolor \
     ${datadir}/kconf_update/* \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kservices5/*.desktop \
diff --git a/recipes-plasma/discover.inc b/recipes-plasma/discover.inc
index 40d1cb7..8572c81 100644
--- a/recipes-plasma/discover.inc
+++ b/recipes-plasma/discover.inc
@@ -32,5 +32,4 @@ inherit cmake_plasma
 FILES_${PN} += " \
     ${libdir}/qml/org/kde/discovernotifier \
     ${libdir}/plasma-discover \
-    ${datadir}/icons/hicolor \
 "
diff --git a/recipes-plasma/kde-cli-tools.inc b/recipes-plasma/kde-cli-tools.inc
index e483ae1..54e9dfc 100644
--- a/recipes-plasma/kde-cli-tools.inc
+++ b/recipes-plasma/kde-cli-tools.inc
@@ -29,6 +29,3 @@ S = "${WORKDIR}/git"
 inherit cmake_plasma
 
 FILES_SOLIBSDEV = ""
-FILES_${PN} += " \
-    ${libdir}/libkdeinit5_*.so \
-"
diff --git a/recipes-plasma/ksysguard.inc b/recipes-plasma/ksysguard.inc
new file mode 100644
index 0000000..f1fc77b
--- /dev/null
+++ b/recipes-plasma/ksysguard.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "KSysguard"
+HOMEPAGE = ""
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
+PR = "r0"
+
+DEPENDS = " \
+    kconfig \
+    kcoreaddons \
+    kdbusaddons \
+    ki18n \
+    kiconthemes \
+    kinit \
+    kitemviews \
+    kio \
+    knewstuff \
+    knotifications \
+    kwindowsystem \
+    libksysguard \
+    \
+    kdoctools \
+    karchive-native \
+"
+
+SRC_URI = " \
+    git://git.kde.org/${BPN};nobranch=1 \
+"
+S = "${WORKDIR}/git"
+
+inherit cmake_plasma
+
+FILES_SOLIBSDEV = ""
diff --git a/recipes-plasma/ksysguard_5.11.5.bb b/recipes-plasma/ksysguard_5.11.5.bb
new file mode 100644
index 0000000..56169bb
--- /dev/null
+++ b/recipes-plasma/ksysguard_5.11.5.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"
diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc
index 97ea147..ed17140 100644
--- a/recipes-plasma/kwin.inc
+++ b/recipes-plasma/kwin.inc
@@ -47,8 +47,8 @@ S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 
+FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
-    ${libdir}/libkdeinit5_kwin*.so \
     ${libdir}/kconf_update_bin/kwin5_update_default_rules \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/kpackage/packagestructure/*.so \
@@ -67,16 +67,12 @@ FILES_${PN} += " \
     ${datadir}/kservices5/kwin/*.desktop \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kservicetypes5/*.desktop \
-    ${datadir}/icons/hicolor/*/*/* \
     ${datadir}/kwincompositing/qml/*.qml \
     ${datadir}/config.kcfg/*.kcfg \
 "
 
-FILES_${PN}-dev = " \
+FILES_${PN}-dev += " \
     ${libdir}/libkwin*.so \
-    ${libdir}/cmake/KWinDBusInterface/*.cmake \
-    ${datadir}/dbus-1/interfaces/*.xml \
-    ${includedir}/*.h \
 "
 
 RDEPENDS_${PN} += " \
diff --git a/recipes-plasma/libksysguard.inc b/recipes-plasma/libksysguard.inc
index ce7bc40..274a35f 100644
--- a/recipes-plasma/libksysguard.inc
+++ b/recipes-plasma/libksysguard.inc
@@ -15,6 +15,7 @@ DEPENDS = " \
     kiconthemes \
     kconfigwidgets \
     kservice \
+    plasma-framework \
 "
 
 SRC_URI = " \
diff --git a/recipes-plasma/packagegroups/plasma-mobile.bb b/recipes-plasma/packagegroups/plasma-mobile.bb
index 19d4500..197cffe 100644
--- a/recipes-plasma/packagegroups/plasma-mobile.bb
+++ b/recipes-plasma/packagegroups/plasma-mobile.bb
@@ -11,6 +11,7 @@ RDEPENDS_${PN} = " \
     kde-cli-tools \
     kdecoration \
     kscreenlocker \
+    ksysguard \
     kwayland-integration \
     kwin \
     libkscreen \
diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc
index fc01e56..fd5853f 100644
--- a/recipes-plasma/plasma-workspace.inc
+++ b/recipes-plasma/plasma-workspace.inc
@@ -47,8 +47,8 @@ inherit cmake_plasma
 
 EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF"
 
+FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
-    ${libdir}/libkdeinit5_*.so \
     ${libdir}/qml/org/kde/taskmanager/* \
     ${libdir}/qml/org/kde/plasma \
     ${datadir}/kstyle/themes/*.themerc \
@@ -68,15 +68,11 @@ FILES_${PN} += " \
     ${datadir}/xsessions/*.desktop \
 "
 
-FILES_${PN}-dev = " \
-    ${includedir} \
+FILES_${PN}-dev += " \
     ${libdir}/libtaskmanager.so \
     ${libdir}/libkworkspace5.so \
     ${libdir}/libplasma-geolocation-interface.so \
     ${libdir}/libweather_ion.so \
-    ${libdir}/cmake/*/*.cmake \
-    ${datadir}/kdevappwizard/templates/* \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "
 
 RDEPENDS_${PN} += " \