From 8cdc178f748025f004f938d4bb29d645319b6445 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 16 Feb 2019 11:43:54 +0100
Subject: [PATCH] Adapt to KF5 changes

---
 classes/cmake_plasma.bbclass                 | 11 ++++-------
 recipes-application/base/konsole.inc         |  3 +++
 recipes-application/graphics/okular.inc      |  3 +++
 recipes-extragear/network/kdeconnect-kde.inc |  3 +++
 recipes-plasma/kwin.inc                      |  4 +---
 recipes-plasma/libksysguard.inc              |  1 -
 recipes-plasma/plasma-settings.inc           |  1 +
 recipes-plasma/powerdevil.inc                |  1 -
 recipes-playground/koko.inc                  |  3 +++
 9 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass
index 0689c97..f163394 100644
--- a/classes/cmake_plasma.bbclass
+++ b/classes/cmake_plasma.bbclass
@@ -1,5 +1,9 @@
 inherit cmake_qt5
 inherit ki18n
+inherit kcoreaddons
+inherit kconfig
+inherit kauth
+inherit kdoctools
 
 EXTRA_OECMAKE += " \
     -DBUILD_TESTING=OFF \
@@ -15,13 +19,6 @@ do_configure_prepend() {
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
 }
 
-do_compile_prepend() {
-    # desktoptojson needs to find installed service type files
-    export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
-    # meinproc5 needs to find its libraries
-    export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH
-}
-
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_*.so \
     ${libdir}/kconf_update_bin/* \
diff --git a/recipes-application/base/konsole.inc b/recipes-application/base/konsole.inc
index 53306f7..556fcd8 100644
--- a/recipes-application/base/konsole.inc
+++ b/recipes-application/base/konsole.inc
@@ -19,5 +19,8 @@ SRC_URI = "git://anongit.kde.org/${BPN};nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
+inherit kcoreaddons
+inherit kconfig
+inherit kauth
 
 FILES_SOLIBSDEV = ""
diff --git a/recipes-application/graphics/okular.inc b/recipes-application/graphics/okular.inc
index bbce270..7d2245e 100644
--- a/recipes-application/graphics/okular.inc
+++ b/recipes-application/graphics/okular.inc
@@ -20,5 +20,8 @@ SRC_URI = "git://anongit.kde.org/${BPN};nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
+inherit kcoreaddons
+inherit kconfig
+inherit kauth
 
 EXTRA_OECMAKE += " -DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST}"
diff --git a/recipes-extragear/network/kdeconnect-kde.inc b/recipes-extragear/network/kdeconnect-kde.inc
index 30d95ab..f3701aa 100644
--- a/recipes-extragear/network/kdeconnect-kde.inc
+++ b/recipes-extragear/network/kdeconnect-kde.inc
@@ -22,6 +22,9 @@ SRC_URI = "git://anongit.kde.org/${BPN};protocol=git"
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
+inherit kcoreaddons
+inherit kconfig
+inherit kauth
 
 EXTRA_OECMAKE += " -DEXPERIMENTALAPP_ENABLED=ON -DSMSAPP_ENABLED=ON -DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST}"
 
diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc
index 6798801..43b465d 100644
--- a/recipes-plasma/kwin.inc
+++ b/recipes-plasma/kwin.inc
@@ -34,8 +34,6 @@ DEPENDS = " \
     fontconfig \
     libepoxy \
     libinput \
-    libxslt-native \
-    karchive-native \
 "
 
 SRC_URI = " \
@@ -44,7 +42,7 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-inherit cmake_plasma
+inherit cmake_plasma kdoctools
 
 do_install_append() {
     # dirty workaround for aurora crash on Wayland
diff --git a/recipes-plasma/libksysguard.inc b/recipes-plasma/libksysguard.inc
index f3b76e1..5a4f7b7 100644
--- a/recipes-plasma/libksysguard.inc
+++ b/recipes-plasma/libksysguard.inc
@@ -9,7 +9,6 @@ DEPENDS = " \
     kconfig \
     kwindowsystem \
     kcompletion \
-    kauth \
     kwidgetsaddons \
     kiconthemes \
     kconfigwidgets \
diff --git a/recipes-plasma/plasma-settings.inc b/recipes-plasma/plasma-settings.inc
index d89928c..5dd46f6 100644
--- a/recipes-plasma/plasma-settings.inc
+++ b/recipes-plasma/plasma-settings.inc
@@ -16,6 +16,7 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
+inherit kdoctools
 
 FILES_${PN} += " \
     ${libdir}/qml \
diff --git a/recipes-plasma/powerdevil.inc b/recipes-plasma/powerdevil.inc
index 3e250cd..f8887ec 100644
--- a/recipes-plasma/powerdevil.inc
+++ b/recipes-plasma/powerdevil.inc
@@ -7,7 +7,6 @@ PR = "r0"
 DEPENDS = " \
     qtx11extras \
     kactivities \
-    kauth \
     kidletime \
     kconfig \
     kdbusaddons \
diff --git a/recipes-playground/koko.inc b/recipes-playground/koko.inc
index 1bc42c1..8e8dc3a 100644
--- a/recipes-playground/koko.inc
+++ b/recipes-playground/koko.inc
@@ -20,3 +20,6 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
+inherit kconfig
+inherit kcoreaddons
+inherit kauth