diff --git a/recipes-hawaii/hawaii-shell/files/0002-client-CMakeLists.txt-avoid-dragging-in-host-libdir.patch b/recipes-hawaii/hawaii-shell/files/0002-client-CMakeLists.txt-avoid-dragging-in-host-libdir.patch deleted file mode 100644 index 573e8fd3..00000000 --- a/recipes-hawaii/hawaii-shell/files/0002-client-CMakeLists.txt-avoid-dragging-in-host-libdir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7dbeaa5509237f3eba7152035d4eb9620c6abaee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 - diff --git a/recipes-hawaii/hawaii-shell/files/0003-compositor-CMakeLists.txt-avoid-dragging-in-host-lib.patch b/recipes-hawaii/hawaii-shell/files/0003-compositor-CMakeLists.txt-avoid-dragging-in-host-lib.patch deleted file mode 100644 index d4511dcf..00000000 --- a/recipes-hawaii/hawaii-shell/files/0003-compositor-CMakeLists.txt-avoid-dragging-in-host-lib.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6ccf0df1c66cef4ea07e169f550c7e3ab62d50ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 - diff --git a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb index 8cc60aef..b97c65b2 100644 --- a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb +++ b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb @@ -5,19 +5,17 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \ " -inherit cmake_qt5 hawaii-git-submodule +inherit cmake_qt5 -DEPENDS = "qtbase qtdeclarative qtwayland qtwayland-native fluid greenisland polkit-qt-1 qtconfiguration qtaccountsservice pixman weston" +DEPENDS = "qtbase qtdeclarative qtwayland qtwayland-native libhawaii fluid greenisland polkit-qt-1 qtconfiguration qtaccountsservice pixman wayland weston systemd alsa-lib" RRECOMMENDS_${PN} += "hawaii-wallpapers" SRC_URI = " \ - git://github.com/mauios/${BPN}.git;protocol=git;branch=stable \ + git://github.com/mauios/${BPN}.git;protocol=git;branch=dev \ 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}" +SRCREV = "9627beb93b92386d8d5004463e968fa9dc3d190c" +PV = "0.2.90+git${SRCPV}" S = "${WORKDIR}/git"