From 38a209514e35a39cdaf26e4dd814c84bc7eeddaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 17 May 2016 08:12:42 +0200 Subject: [PATCH] kwayland: move to kf5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../files/0001-do-not-perform-runtime-tests.patch | 0 .../0002-PlasmaShell-and-PlasmaSurface-interfaces.patch | 0 .../kwayland/files/0003-PlasmaEffects-interface.patch | 0 .../kwayland/files/0004-Server-side-interface.patch | 0 .../{plasma/untier => kf5/tier1}/kwayland/kwayland.bb | 8 ++++---- recipes-kde/packagegroups/kf5-world.bb | 1 + recipes-kde/packagegroups/plasma-world.bb | 1 - 7 files changed, 5 insertions(+), 5 deletions(-) rename recipes-kde/{plasma/untier => kf5/tier1}/kwayland/files/0001-do-not-perform-runtime-tests.patch (100%) rename recipes-kde/{plasma/untier => kf5/tier1}/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch (100%) rename recipes-kde/{plasma/untier => kf5/tier1}/kwayland/files/0003-PlasmaEffects-interface.patch (100%) rename recipes-kde/{plasma/untier => kf5/tier1}/kwayland/files/0004-Server-side-interface.patch (100%) rename recipes-kde/{plasma/untier => kf5/tier1}/kwayland/kwayland.bb (70%) diff --git a/recipes-kde/plasma/untier/kwayland/files/0001-do-not-perform-runtime-tests.patch b/recipes-kde/kf5/tier1/kwayland/files/0001-do-not-perform-runtime-tests.patch similarity index 100% rename from recipes-kde/plasma/untier/kwayland/files/0001-do-not-perform-runtime-tests.patch rename to recipes-kde/kf5/tier1/kwayland/files/0001-do-not-perform-runtime-tests.patch diff --git a/recipes-kde/plasma/untier/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch b/recipes-kde/kf5/tier1/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch similarity index 100% rename from recipes-kde/plasma/untier/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch rename to recipes-kde/kf5/tier1/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch diff --git a/recipes-kde/plasma/untier/kwayland/files/0003-PlasmaEffects-interface.patch b/recipes-kde/kf5/tier1/kwayland/files/0003-PlasmaEffects-interface.patch similarity index 100% rename from recipes-kde/plasma/untier/kwayland/files/0003-PlasmaEffects-interface.patch rename to recipes-kde/kf5/tier1/kwayland/files/0003-PlasmaEffects-interface.patch diff --git a/recipes-kde/plasma/untier/kwayland/files/0004-Server-side-interface.patch b/recipes-kde/kf5/tier1/kwayland/files/0004-Server-side-interface.patch similarity index 100% rename from recipes-kde/plasma/untier/kwayland/files/0004-Server-side-interface.patch rename to recipes-kde/kf5/tier1/kwayland/files/0004-Server-side-interface.patch diff --git a/recipes-kde/plasma/untier/kwayland/kwayland.bb b/recipes-kde/kf5/tier1/kwayland/kwayland.bb similarity index 70% rename from recipes-kde/plasma/untier/kwayland/kwayland.bb rename to recipes-kde/kf5/tier1/kwayland/kwayland.bb index d7714dd8..90ce150f 100644 --- a/recipes-kde/plasma/untier/kwayland/kwayland.bb +++ b/recipes-kde/kf5/tier1/kwayland/kwayland.bb @@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-plasma cmake-lib +inherit kde-kf5 cmake-lib DEPENDS += "wayland wayland-native" -PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "eb9f146778e5bc3f238cc7ce8262d73a" -SRC_URI[sha256sum] = "d8ac15243b0f648429e76d925cced8d16d5b001218509395653a5a5d76be3552" +PV = "${KF5_VERSION}" +SRC_URI[md5sum] = "5ced8f7f6c75116297c99c83817022ca" +SRC_URI[sha256sum] = "fe650aedfdbcd58ad2bd9ce4d2fc6119304c32f8a7a720e9dcc1ef13155ed1c9" SRC_URI += "file://0001-do-not-perform-runtime-tests.patch" CMAKE_ALIGN_SYSROOT[1] = "KF5Wayland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/packagegroups/kf5-world.bb b/recipes-kde/packagegroups/kf5-world.bb index 0a69ab33..d58720c8 100644 --- a/recipes-kde/packagegroups/kf5-world.bb +++ b/recipes-kde/packagegroups/kf5-world.bb @@ -20,6 +20,7 @@ TIER_1 = " \ kitemmodels \ kitemviews \ kplotting \ + kwayland \ kwidgetsaddons \ kwindowsystem \ modemmanager-qt \ diff --git a/recipes-kde/packagegroups/plasma-world.bb b/recipes-kde/packagegroups/plasma-world.bb index 94b91c1b..805ea972 100644 --- a/recipes-kde/packagegroups/plasma-world.bb +++ b/recipes-kde/packagegroups/plasma-world.bb @@ -34,7 +34,6 @@ UNTIER = " \ ksshaskpass \ ksysguard \ kwallet-pam \ - kwayland \ kwayland-integration \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin", "",d)} \ kwrited \