From b54b8fc91b064190c2417154e0908b8614ef0574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 4 May 2015 12:44:20 +0200
Subject: [PATCH] kde: fix packaging - leftover of previous plugin-move commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb        | 3 ++-
 recipes-kde/plasma/tier3/baloo/baloo.bb                  | 9 ++++++---
 recipes-kde/plasma/untier/kio-extras/kio-extras.bb       | 6 +++---
 recipes-kde/plasma/untier/kwin/kwin.bb                   | 3 ++-
 recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb         | 4 ++--
 .../plasma/untier/systemsettings/systemsettings.bb       | 4 ++--
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
index a463c5a6..d141b609 100644
--- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
@@ -40,8 +40,9 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5KHtml, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/kf5/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
 "
diff --git a/recipes-kde/plasma/tier3/baloo/baloo.bb b/recipes-kde/plasma/tier3/baloo/baloo.bb
index 1d671e54..53c93da2 100644
--- a/recipes-kde/plasma/tier3/baloo/baloo.bb
+++ b/recipes-kde/plasma/tier3/baloo/baloo.bb
@@ -20,12 +20,15 @@ CMAKE_ALIGN_SYSROOT[1] = "KF5Baloo, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Baloo, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir} \
-	${libdir}/qml/org/kde/baloo \
-	${libdir}/plugins ${libdir}/kauth \
+    ${libdir}/qml/org/kde/baloo \
+    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${libdir}/kauth \
 "
+
 FILES_${PN}-dbg += " \
 	${libdir}/qml/org/kde/baloo/.debug \
 	${libdir}/*/.debug \
-	${libdir}/plugins/kf5/*/.debug \
+	${libdir}/${QT_DIR_NAME}/plugins/.debug \
+	${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
 "
 
diff --git a/recipes-kde/plasma/untier/kio-extras/kio-extras.bb b/recipes-kde/plasma/untier/kio-extras/kio-extras.bb
index acda9c08..874e0b23 100644
--- a/recipes-kde/plasma/untier/kio-extras/kio-extras.bb
+++ b/recipes-kde/plasma/untier/kio-extras/kio-extras.bb
@@ -59,10 +59,10 @@ FILES_${PN} += " \
     ${datadir}/kio_docfilter \
     ${datadir}/solid \
     \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
-    ${libdir}/plugins/kf5/kio/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/kio/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index e8367d9f..04e47ec2 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -66,7 +66,7 @@ FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/icons \
     ${datadir}/*5 \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
     ${libdir}/qml \
     ${libdir}/kconf_update_bin \
 "
@@ -82,6 +82,7 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
     ${libdir}/*/.debug \
     ${libdir}/*/*/.debug \
+    ${libdir}/*/*/*/.debug \
     ${libdir}/*/*/*/*/.debug \
     ${libdir}/*/*/*/*/*/.debug \
     ${libdir}/*/*/*/*/*/*/.debug \
diff --git a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
index 3c78d468..4b8af7a4 100644
--- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
+++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
@@ -49,12 +49,12 @@ FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/plasma \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
     ${libdir}/qml \
     ${libdir}/*.so \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
     ${libdir}/qml/*/*/*/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
index 82e35894..0d9bb49b 100644
--- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
+++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
@@ -28,9 +28,9 @@ SRC_URI[sha256sum] = "701bf4a62c55dafcd9994d9e193c0895b7d531422f674b5548a664435a
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
 "