hawaii-shell: make it build cleanly

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

recipes-maui/hawaii-shell/files/0002-client-CMakeLists.txt-avoid-dragging-in-host-libdir.patch

@@ -0,0 +1,31 @@
+From 7dbeaa5509237f3eba7152035d4eb9620c6abaee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 15 Jan 2014 18:54:06 +0100
+Subject: [PATCH] client/CMakeLists.txt: avoid dragging in host libdir
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/client/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
+index 3bdb0fd..c2fb4a6 100644
+--- a/src/client/CMakeLists.txt
++++ b/src/client/CMakeLists.txt
+@@ -107,7 +107,7 @@ add_executable(hawaii-desktop-shell ${SOURCES} ${RESOURCES})
+ qt5_use_modules(hawaii-desktop-shell Quick Widgets)
+ set_target_properties(hawaii-desktop-shell PROPERTIES
+     COMPILE_FLAGS "-rdynamic"
+-    LINK_FLAGS "-L${WaylandClient_LIBDIR} -L${POLKITQT-1_LIB_DIR}"
++    LINK_FLAGS "-L${POLKITQT-1_LIB_DIR}"
+ )
+ target_link_libraries(hawaii-desktop-shell
+     ${WaylandClient_LIBRARIES}
+-- 
+1.8.3.1
+

recipes-maui/hawaii-shell/files/0003-compositor-CMakeLists.txt-avoid-dragging-in-host-lib.patch

@@ -0,0 +1,32 @@
+From 6ccf0df1c66cef4ea07e169f550c7e3ab62d50ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 15 Jan 2014 19:11:44 +0100
+Subject: [PATCH] compositor/CMakeLists.txt: : avoid dragging in host libdir
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/compositor/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt
+index 28fd3bf..4389aea 100644
+--- a/src/compositor/CMakeLists.txt
++++ b/src/compositor/CMakeLists.txt
+@@ -75,9 +75,6 @@ qt5_add_resources(RESOURCES hawaii-shell.qrc)
+ 
+ add_executable(hawaii-shell ${SOURCES} ${RESOURCES})
+ qt5_use_modules(hawaii-shell Quick Compositor)
+-set_target_properties(hawaii-shell PROPERTIES
+-    LINK_FLAGS -L${WaylandServer_LIBDIR}
+-)
+ target_link_libraries(hawaii-shell
+     ${GreenIsland_LIBRARIES}
+     ${WaylandServer_LIBRARIES}
+-- 
+1.8.3.1
+

recipes-maui/hawaii-shell/hawaii-shell_git.bb

@@ -13,6 +13,8 @@ RRECOMMENDS_${PN} += "hawaii-wallpapers"
 SRC_URI = " \
 	git://github.com/mauios/${BPN}.git;protocol=git;branch=stable \
 	file://0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch \
+	file://0002-client-CMakeLists.txt-avoid-dragging-in-host-libdir.patch \
+	file://0003-compositor-CMakeLists.txt-avoid-dragging-in-host-lib.patch \
 "
 SRCREV = "efc18add78e292f9afb7167314b58286162281dc"
 PV = "0.2.0.2+git${SRCPV}"
@@ -22,11 +24,11 @@ EXT-SRCREV-libqtxdg = "b889f2b71cd79ef67cecd7e0415525ad959c50cd"
 
 S = "${WORKDIR}/git"
 
-FILES_${PN} += "${libdir}/hawaii/qml/Fluid*"
-FILES_${PN}-dbg += "${libdir}/hawaii/qml/FluidExtra/.debug"
-
-# make it find qtwaylandscanner
-EXTRA_OECMAKE += "-DCMAKE_PROGRAM_PATH=${STAGING_DIR_NATIVE}/$bindir/qt5"
+# make it find qtwaylandscanner / use our libexdir
+EXTRA_OECMAKE += " \
+	-DCMAKE_PROGRAM_PATH=${STAGING_DIR_NATIVE}/$bindir/qt5 \
+	-DCMAKE_INSTALL_LIBEXECDIR=${libexecdir} \
+"
 
 do_configure_prepend() {
 	OLD_PATH=`pwd`
@@ -39,3 +41,15 @@ do_configure_prepend() {
 
 	cd $OLD_PATH
 }
+
+FILES_${PN} += " \
+	${datadir}/hawaii \
+	${libdir}/hawaii \
+	${libdir}/weston \
+"
+FILES_${PN}-dbg += " \
+	${libdir}/hawaii/*/*/.debug \
+	${libdir}/hawaii/*/*/*/.debug \
+	${libdir}/hawaii/*/*/*/*/.debug \
+	${libdir}/weston/.debug \
+"