greenisland: update to latest sources and cleanup a bit

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

recipes-hawaii/greenisland/files/0001-Use-correct-API-for-QWaylandOutput.patch

@@ -1,45 +0,0 @@
-From af912a6bb0032cf0bec015883f7baa1e530c8891 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 26 Nov 2014 09:55:07 +0100
-Subject: [PATCH] Use correct API for QWaylandOutput
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The last patch-series sent mainline [1] differs from from mauii-qtwayland [2].
-Since we decided to use upstream, we have to follow different API.
-
-[1] https://codereview.qt-project.org/#/c/90881/
-[2] https://github.com/maui-project/qtwayland/blob/maui-5.3/src/compositor/compositor_api/qwaylandoutput.h
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/libgreenisland/output.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/libgreenisland/output.cpp b/src/libgreenisland/output.cpp
-index f7bce60..498af0b 100644
---- a/src/libgreenisland/output.cpp
-+++ b/src/libgreenisland/output.cpp
-@@ -118,8 +118,7 @@ void OutputPrivate::_q_posChanged()
-  */
- 
- Output::Output(Compositor *compositor, KScreen::Output *output)
--    : QWaylandQuickOutput(compositor, new OutputWindow(compositor),
--                          output->edid()->vendor(), output->edid()->serial())
-+    : QWaylandQuickOutput(compositor, new OutputWindow(compositor))
-     , d_ptr(new OutputPrivate(this))
- {
-     Q_D(Output);
-@@ -131,6 +130,8 @@ Output::Output(Compositor *compositor, KScreen::Output *output)
-     d->_q_primaryChanged();
-     d->_q_currentModeIdChanged();
-     d->_q_posChanged();
-+    setManufacturer(output->edid()->vendor());
-+    setModel(output->edid()->serial());
- 
-     // React to output changes
-     connect(output, SIGNAL(isPrimaryChanged()),
--- 
-1.8.3.1
-

recipes-hawaii/greenisland/greenisland_git.bb

@@ -4,18 +4,24 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
 
 inherit cmake_qt5 pythonnative pkgconfig
 
-DEPENDS = "extra-cmake-modules-native qtbase qtdeclarative qtwayland ki18n libkscreen kservice virtual/egl"
-SRC_URI = " \
-	git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
+DEPENDS = " \
+    ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+    extra-cmake-modules-native \
+    qtbase \
+    qtdeclarative \
+    qtquickcontrols \
+    qtwayland \
+    libkscreen \
+    virtual/egl \
 "
-#	file://0001-Use-correct-API-for-QWaylandOutput.patch
+SRC_URI = "git://github.com/greenisland/${BPN}.git;protocol=git;branch=master"
 
-SRCREV = "e1dbde7b18d8a1f5256368d74baa6ce398334722"
+SRCREV = "3f8ccb4613112eb3b0d7f9c3a3cf5c157fecbc92"
 PV = "0.5.90+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-# for wayland scanner
+# make it find qtwaylandscanner
 EXTRA_OECMAKE += " \
 	-DCMAKE_PROGRAM_PATH=${STAGING_DIR_NATIVE}/$bindir/qt5 \
 "