diff --git a/recipes-hawaii/greenisland/files/0001-Add-versions-to-resources.patch b/recipes-hawaii/greenisland/files/0001-Add-versions-to-resources.patch deleted file mode 100644 index aac0bb22..00000000 --- a/recipes-hawaii/greenisland/files/0001-Add-versions-to-resources.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 0abb461bf75af2b70830bbdda3fea850fa5914e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 26 Nov 2014 10:27:29 +0100 -Subject: [PATCH] Add versions to resources -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -see qtwayland commit bbd4a8f85b2e0ddaa94458569b8b5aa4128c52b1 -Author: Giulio Camuffo -Date: Tue Sep 30 17:09:49 2014 +0300 - - Fix the compositor's wayland versioning - - We cannot just assume all clients implement the same version of the - various interfaces as the compositor does. Keep track of them, and - react accordingly when creating a resource or sending an event. - - Change-Id: I9792433a14d49c5c4df0c892fc1349ce0dfb0d43 - Reviewed-by: Jørgen Lind - -Signed-off-by: Andreas Müller ---- - src/compositor/protocols/plasma/plasmasurface.cpp | 2 +- - src/compositor/protocols/wl-shell/wlshellsurface.cpp | 2 +- - src/compositor/protocols/xdg-shell/xdgpopup.cpp | 2 +- - src/compositor/protocols/xdg-shell/xdgsurface.cpp | 2 +- - src/compositor/quicksurface.cpp | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/compositor/protocols/plasma/plasmasurface.cpp b/src/compositor/protocols/plasma/plasmasurface.cpp -index 3a09dd7..29be679 100644 ---- a/src/compositor/protocols/plasma/plasmasurface.cpp -+++ b/src/compositor/protocols/plasma/plasmasurface.cpp -@@ -37,7 +37,7 @@ namespace GreenIsland { - PlasmaSurface::PlasmaSurface(PlasmaShell *shell, QuickSurface *surface, - wl_client *client, uint32_t id) - : QWaylandSurfaceInterface(surface) -- , QtWaylandServer::org_kde_plasma_surface(client, id) -+ , QtWaylandServer::org_kde_plasma_surface(client, id, 1) - , m_compositor(qobject_cast(surface->compositor())) - , m_shell(shell) - , m_surface(surface) -diff --git a/src/compositor/protocols/wl-shell/wlshellsurface.cpp b/src/compositor/protocols/wl-shell/wlshellsurface.cpp -index c9f93a4..a4deb39 100644 ---- a/src/compositor/protocols/wl-shell/wlshellsurface.cpp -+++ b/src/compositor/protocols/wl-shell/wlshellsurface.cpp -@@ -44,7 +44,7 @@ namespace GreenIsland { - WlShellSurface::WlShellSurface(WlShell *shell, QuickSurface *surface, - wl_client *client, uint32_t id) - : QWaylandSurfaceInterface(surface) -- , QtWaylandServer::wl_shell_surface(client, id) -+ , QtWaylandServer::wl_shell_surface(client, id, 1) - , m_shell(shell) - , m_surface(surface) - , m_moveGrabber(Q_NULLPTR) -diff --git a/src/compositor/protocols/xdg-shell/xdgpopup.cpp b/src/compositor/protocols/xdg-shell/xdgpopup.cpp -index 91b0a46..cf312fc 100644 ---- a/src/compositor/protocols/xdg-shell/xdgpopup.cpp -+++ b/src/compositor/protocols/xdg-shell/xdgpopup.cpp -@@ -36,7 +36,7 @@ namespace GreenIsland { - XdgPopup::XdgPopup(XdgShell *shell, QWaylandSurface *parent, QWaylandSurface *surface, - wl_client *client, uint32_t id, uint32_t serial) - : QWaylandSurfaceInterface(surface) -- , QtWaylandServer::xdg_popup(client, id) -+ , QtWaylandServer::xdg_popup(client, id, 1) - , m_shell(shell) - , m_parentSurface(parent) - , m_surface(surface) -diff --git a/src/compositor/protocols/xdg-shell/xdgsurface.cpp b/src/compositor/protocols/xdg-shell/xdgsurface.cpp -index 62783b1..15ff8a2 100644 ---- a/src/compositor/protocols/xdg-shell/xdgsurface.cpp -+++ b/src/compositor/protocols/xdg-shell/xdgsurface.cpp -@@ -44,7 +44,7 @@ namespace GreenIsland { - XdgSurface::XdgSurface(XdgShell *shell, QuickSurface *surface, - wl_client *client, uint32_t id) - : QWaylandSurfaceInterface(surface) -- , QtWaylandServer::xdg_surface(client, id) -+ , QtWaylandServer::xdg_surface(client, id, 1) - , m_shell(shell) - , m_surface(surface) - , m_moveGrabber(Q_NULLPTR) -diff --git a/src/compositor/quicksurface.cpp b/src/compositor/quicksurface.cpp -index 8de2f24..d24db01 100644 ---- a/src/compositor/quicksurface.cpp -+++ b/src/compositor/quicksurface.cpp -@@ -30,7 +30,7 @@ - namespace GreenIsland { - - QuickSurface::QuickSurface(wl_client *client, quint32 id, Compositor *compositor) -- : QWaylandQuickSurface(client, id, compositor) -+ : QWaylandQuickSurface(client, id, 2, compositor) - , m_state(Normal) - , m_globalPos(-1, -1) - { --- -1.8.3.1 - diff --git a/recipes-hawaii/greenisland/files/0002-Use-correct-API-for-QWaylandOutput.patch b/recipes-hawaii/greenisland/files/0001-Use-correct-API-for-QWaylandOutput.patch similarity index 65% rename from recipes-hawaii/greenisland/files/0002-Use-correct-API-for-QWaylandOutput.patch rename to recipes-hawaii/greenisland/files/0001-Use-correct-API-for-QWaylandOutput.patch index ec13dc8b..bb6f1f83 100644 --- a/recipes-hawaii/greenisland/files/0002-Use-correct-API-for-QWaylandOutput.patch +++ b/recipes-hawaii/greenisland/files/0001-Use-correct-API-for-QWaylandOutput.patch @@ -14,32 +14,32 @@ Since we decided to use upstream, we have to follow different API. Signed-off-by: Andreas Müller --- - src/compositor/output.cpp | 5 +++-- + src/libgreenisland/output.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/src/compositor/output.cpp b/src/compositor/output.cpp +diff --git a/src/libgreenisland/output.cpp b/src/libgreenisland/output.cpp index f7bce60..498af0b 100644 ---- a/src/compositor/output.cpp -+++ b/src/compositor/output.cpp -@@ -110,8 +110,7 @@ void OutputPrivate::_q_posChanged() +--- 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) -- : QWaylandOutput(compositor, new OutputWindow(compositor), -- output->edid()->vendor(), output->edid()->serial()) -+ : QWaylandOutput(compositor, new OutputWindow(compositor)) +- : QWaylandQuickOutput(compositor, new OutputWindow(compositor), +- output->edid()->vendor(), output->edid()->serial()) ++ : QWaylandQuickOutput(compositor, new OutputWindow(compositor)) , d_ptr(new OutputPrivate(this)) { Q_D(Output); -@@ -124,6 +123,8 @@ Output::Output(Compositor *compositor, KScreen::Output *output) - setPhysicalSize(d->output->sizeMm()); +@@ -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, &KScreen::Output::isPrimaryChanged, + connect(output, SIGNAL(isPrimaryChanged()), -- 1.8.3.1 diff --git a/recipes-hawaii/greenisland/greenisland_git.bb b/recipes-hawaii/greenisland/greenisland_git.bb index bf2ad888..9db1ff31 100644 --- a/recipes-hawaii/greenisland/greenisland_git.bb +++ b/recipes-hawaii/greenisland/greenisland_git.bb @@ -4,14 +4,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" inherit cmake_qt5 pythonnative pkgconfig -DEPENDS = "extra-cmake-modules-native qtbase qtdeclarative qtwayland ki18n libkscreen kservice kpackage virtual/egl" - +DEPENDS = "extra-cmake-modules-native qtbase qtdeclarative qtwayland ki18n libkscreen kservice virtual/egl" SRC_URI = " \ - git://github.com/mauios/${BPN}.git;protocol=git;branch=master \ - file://0001-Add-versions-to-resources.patch \ - file://0002-Use-correct-API-for-QWaylandOutput.patch \ + git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \ " -SRCREV = "68ebbcc4172409958b00aaab534b5085fd538984" +# file://0001-Use-correct-API-for-QWaylandOutput.patch + +SRCREV = "e1dbde7b18d8a1f5256368d74baa6ce398334722" PV = "0.5.90+git${SRCPV}" S = "${WORKDIR}/git" @@ -24,5 +23,6 @@ EXTRA_OECMAKE += " \ # this should be fixed elsewhere.. CXXFLAGS_append_mx6 = " -DEGL_API_FB" -FILES_${PN} += "${libdir}/qml/GreenIsland ${libdir}/plugins/kpackage" -FILES_${PN}-dbg += "${libdir}/qml/GreenIsland/.debug ${libdir}/plugins/kpackage/*/.debug" +FILES_${PN} += "${libdir}/qml/GreenIsland" +FILES_${PN}-dbg += "${libdir}/qml/GreenIsland/.debug" +FILES_${PN}-dev += "${libdir}/cmake"