From a7e0296f2fe337e8a45bf37fcb61fce4b9510370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 26 Jan 2015 16:03:06 +0100
Subject: [PATCH] Revert "replace hawaii-shell by pss"

Seems hawaii/mauii has stumbled for kf5 dependencies to and comes back to hawaii-shell

This reverts commit f5cfa4f818680835bac6915a06cafdaf5153c255.
---
 ...make-call-git-directly-it-is-not-fou.patch | 32 +++++++++++++++++++
 .../hawaii-shell_0.5.90.bb}                   |  8 +++--
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 recipes-hawaii/shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch
 rename recipes-hawaii/{pss/pss_0.5.90.bb => shell/hawaii-shell_0.5.90.bb} (83%)

diff --git a/recipes-hawaii/shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch b/recipes-hawaii/shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch
new file mode 100644
index 00000000..26149a45
--- /dev/null
+++ b/recipes-hawaii/shell/files/0001-GetGitRevision.cmake-call-git-directly-it-is-not-fou.patch
@@ -0,0 +1,32 @@
+From 309df29de77eba24ac6ff37e792f16776fec3165 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 14 Jan 2014 13:25:07 +0100
+Subject: [PATCH] GetGitRevision.cmake: call git directly - it is not found by
+ cmake macros
+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>
+---
+ cmake/GetGitRevision.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/GetGitRevision.cmake b/cmake/GetGitRevision.cmake
+index 144b1ac..884eb3c 100644
+--- a/cmake/GetGitRevision.cmake
++++ b/cmake/GetGitRevision.cmake
+@@ -39,7 +39,7 @@ function(create_git_head_revision_file _file _target)
+         add_custom_target(gitsha1
+             ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/${_file}
+             COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_file}.in ${CMAKE_CURRENT_BINARY_DIR}/${_file}
+-            COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD >> ${CMAKE_CURRENT_BINARY_DIR}/${_file}
++            COMMAND git rev-parse HEAD >> ${CMAKE_CURRENT_BINARY_DIR}/${_file}
+             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+             VERBATIM)
+         add_dependencies(${_target} gitsha1)
+-- 
+1.8.3.1
+
diff --git a/recipes-hawaii/pss/pss_0.5.90.bb b/recipes-hawaii/shell/hawaii-shell_0.5.90.bb
similarity index 83%
rename from recipes-hawaii/pss/pss_0.5.90.bb
rename to recipes-hawaii/shell/hawaii-shell_0.5.90.bb
index 8465be28..686b4858 100644
--- a/recipes-hawaii/pss/pss_0.5.90.bb
+++ b/recipes-hawaii/shell/hawaii-shell_0.5.90.bb
@@ -1,5 +1,5 @@
-SUMMARY = "Mauii Plasma Simple Shell"
-LICENSE = "GPLv2 | LGPLv2.1"
+SUMMARY = "Hawaii desktop environment shell"
+LICENSE = "LGPLv2 LGPLv2.1"
 LIC_FILES_CHKSUM = " \
 	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 	file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \
@@ -22,7 +22,7 @@ DEPENDS = " \
 "
 
 SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
-SRCREV = "9789d63a55e2ca74a70029574a6fe1a1dd94cbc2"
+SRCREV = "55bb4e9f5b861eff7e552cc27b61969fb1f7b728"
 
 S = "${WORKDIR}/git"
 
@@ -42,3 +42,5 @@ FILES_${PN}-dbg += " \
 
 # starter scripts rely on bash qdbus catchsegv
 RDEPENDS_${PN} = "bash qttools-tools qtwayland-plugins catchsegv"
+
+RRECOMMENDS_${PN} += "hawaii-wallpapers"