From aa85f0a19182ebe922ed3037dec9d8e32ab01246 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sun, 29 Oct 2017 19:16:23 +0100
Subject: [PATCH] Move handling of D-Bus files to the KF5 class

---
 classes/cmake_kf5.bbclass            | 5 +++++
 recipes-kf5/tier2/kjobwidgets.inc    | 4 ----
 recipes-kf5/tier2/knotifications.inc | 4 ----
 recipes-kf5/tier3/baloo.inc          | 4 ----
 recipes-kf5/tier3/kded.inc           | 2 --
 recipes-kf5/tier3/kglobalaccel.inc   | 5 -----
 recipes-kf5/tier3/kinit.inc          | 1 -
 recipes-kf5/tier3/kio.inc            | 5 -----
 recipes-kf5/tier3/krunner.inc        | 1 -
 recipes-kf5/tier3/kwallet.inc        | 5 -----
 10 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index d2ac51c..87f047b 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -22,7 +22,12 @@ do_install_prepend() {
 
 BBCLASSEXTEND = "native nativesdk"
 
+FILES_${PN} += " \
+    ${datadir}/dbus-1/services/*.service \
+"
+
 FILES_${PN}-dev += " \
+    ${datadir}/dbus-1/interfaces/*.xml \
     ${libdir}/cmake/KF5*/*.cmake \
     ${prefix}/mkspecs/modules/qt_*.pri \
 "
diff --git a/recipes-kf5/tier2/kjobwidgets.inc b/recipes-kf5/tier2/kjobwidgets.inc
index 273cc74..d038268 100644
--- a/recipes-kf5/tier2/kjobwidgets.inc
+++ b/recipes-kf5/tier2/kjobwidgets.inc
@@ -11,7 +11,3 @@ SRC_URI = "git://anongit.kde.org/kjobwidgets;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN} += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier2/knotifications.inc b/recipes-kf5/tier2/knotifications.inc
index 385db14..23bf694 100644
--- a/recipes-kf5/tier2/knotifications.inc
+++ b/recipes-kf5/tier2/knotifications.inc
@@ -15,7 +15,3 @@ inherit cmake_kf5
 FILES_${PN} += " \
     ${datadir}/kservicetypes5/knotificationplugin.desktop \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier3/baloo.inc b/recipes-kf5/tier3/baloo.inc
index bca9531..7c30b1d 100644
--- a/recipes-kf5/tier3/baloo.inc
+++ b/recipes-kf5/tier3/baloo.inc
@@ -34,7 +34,3 @@ FILES_${PN} += " \
     ${datadir}/icons/hicolor/128x128/apps/baloo.png \
     ${datadir}/kservices5/*.protocol \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier3/kded.inc b/recipes-kf5/tier3/kded.inc
index 139a088..1894280 100644
--- a/recipes-kf5/tier3/kded.inc
+++ b/recipes-kf5/tier3/kded.inc
@@ -23,11 +23,9 @@ inherit cmake_kf5
 FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_kded5.so \
-    ${datadir}/dbus-1/services/*.service \
     ${datadir}/kservicetypes5/*.desktop \
 "
 
 FILES_${PN}-dev += " \
     ${libdir}/cmake/KDED/*.cmake \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "
diff --git a/recipes-kf5/tier3/kglobalaccel.inc b/recipes-kf5/tier3/kglobalaccel.inc
index 58f7e6a..f21cb2b 100644
--- a/recipes-kf5/tier3/kglobalaccel.inc
+++ b/recipes-kf5/tier3/kglobalaccel.inc
@@ -19,11 +19,6 @@ S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/kf5_org.*.xml \
-"
-
 FILES_${PN} += " \
-    ${datadir}/dbus-1/services/org.kde.kglobalaccel.service \
     ${datadir}/kservices5/kglobalaccel5.desktop \
 "
diff --git a/recipes-kf5/tier3/kinit.inc b/recipes-kf5/tier3/kinit.inc
index bb73b25..f76e722 100644
--- a/recipes-kf5/tier3/kinit.inc
+++ b/recipes-kf5/tier3/kinit.inc
@@ -30,5 +30,4 @@ FILES_${PN} += " \
 
 FILES_${PN}-dev += " \
     ${libdir}/cmake/KF5Init/kde5init_dummy.cpp.in \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "
diff --git a/recipes-kf5/tier3/kio.inc b/recipes-kf5/tier3/kio.inc
index b45f894..62d2017 100644
--- a/recipes-kf5/tier3/kio.inc
+++ b/recipes-kf5/tier3/kio.inc
@@ -42,10 +42,5 @@ FILES_${PN} += " \
     ${datadir}/kservices5/useragentstrings/*.desktop \
     ${datadir}/kservices5/searchproviders/*.desktop \
     ${datadir}/kservicetypes5/*.desktop \
-    ${datadir}/dbus-1/services/*.service \
     ${datadir}/kf5/kcookiejar/domain_info \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier3/krunner.inc b/recipes-kf5/tier3/krunner.inc
index 452f367..747d24b 100644
--- a/recipes-kf5/tier3/krunner.inc
+++ b/recipes-kf5/tier3/krunner.inc
@@ -31,5 +31,4 @@ FILES_${PN} += " \
 
 FILES_${PN}-dev += " \
     ${datadir}/kdevappwizard/templates/* \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "
diff --git a/recipes-kf5/tier3/kwallet.inc b/recipes-kf5/tier3/kwallet.inc
index 7f17642..690e35d 100644
--- a/recipes-kf5/tier3/kwallet.inc
+++ b/recipes-kf5/tier3/kwallet.inc
@@ -31,9 +31,4 @@ inherit python3native
 FILES_${PN} += " \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kservices5/*.desktop \
-    ${datadir}/dbus-1/services/*.service \
-"
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "