diff --git a/recipes-hawaii/shell/hawaii-shell_0.5.90.bb b/recipes-hawaii/shell/hawaii-shell_0.5.90.bb index 8637e7ab..686b4858 100644 --- a/recipes-hawaii/shell/hawaii-shell_0.5.90.bb +++ b/recipes-hawaii/shell/hawaii-shell_0.5.90.bb @@ -5,10 +5,21 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \ " -inherit cmake_qt5 systemd cmake-lib +inherit cmake_qt5 systemd pythonnative -DEPENDS = "qtscript libhawaii fluid greenisland polkit-qt-1 qtconfiguration qtaccountsservice pixman wayland weston systemd alsa-lib solid krunner" -RRECOMMENDS_${PN} += "hawaii-wallpapers" +DEPENDS = " \ + qtscript \ + plasma-framework \ + plasma-workspace \ + ki18n \ + kdelibs4support \ + krunner \ + kservice \ + solid \ + kitemmodels \ + kemoticons \ + kinit \ +" SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master" SRCREV = "55bb4e9f5b861eff7e552cc27b61969fb1f7b728" @@ -19,24 +30,17 @@ S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ -DCMAKE_PROGRAM_PATH=${STAGING_DIR_NATIVE}/$bindir/qt5 \ -DCMAKE_INSTALL_LIBEXECDIR=${bindir} \ - -DADDITIONAL_PATH=${bindir}/${QT_DIR_NAME} \ " -CMAKE_HIDE_ERROR[1] = "HawaiiShell/HawaiiShellTargets.cmake, -cccoutforoe filecheckloop, -cccoutforoe filecheckloop" - FILES_${PN} += " \ - ${datadir}/hawaii \ - ${datadir}/wayland-sessions \ - ${libdir}/hawaii \ - ${libdir}/weston \ - ${libdir}/systemd \ + ${datadir} \ + ${libdir}/qml \ " FILES_${PN}-dbg += " \ - ${libdir}/hawaii/plugins/*/.debug \ - ${libdir}/hawaii/qml/Hawaii/Shell/*/.debug \ - ${libdir}/hawaii/qml/Hawaii/Shell/*/*/.debug \ - ${libdir}/weston/.debug \ + ${libdir}/qml/*/*/*/*/.debug \ " # starter scripts rely on bash qdbus catchsegv -RDEPENDS_${PN} = "bash qttools-tools qtwayland-plugins weston catchsegv" +RDEPENDS_${PN} = "bash qttools-tools qtwayland-plugins catchsegv" + +RRECOMMENDS_${PN} += "hawaii-wallpapers"