From 6c968d98288e1dfa456308ae07a12ac70352db54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 2 Feb 2015 11:45:47 +0100 Subject: [PATCH] reorganize kde recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/layer.conf | 6 ++++-- recipes-kde/{ => kf5}/kf5-version.inc | 0 ...ke-broken-glib-a-configure-option-we-cannot-run-co.patch | 0 .../files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch | 0 .../files/0003-only-build-kf5-config-for-native.patch | 0 .../kdelibs4support/kdelibs4support-native.bb | 0 .../poritng-aids-tier3}/kdelibs4support/kdelibs4support.bb | 0 .../poritng-aids-tier3}/kdelibs4support/kdelibs4support.inc | 0 .../poritng-aids-tier3}/kjsembed/kjsembed.bb | 0 .../poritng-aids-tier3}/krunner/krunner.bb | 0 .../files/0001-native-build-and-install-icemaker-only.patch | 0 recipes-kde/{ => kf5}/porting-aids-tier1/kjs/kjs-native.bb | 0 recipes-kde/{ => kf5}/porting-aids-tier1/kjs/kjs.bb | 0 recipes-kde/{ => kf5}/porting-aids-tier1/kjs/kjs.inc | 0 recipes-kde/{framework-tier1 => kf5/tier1}/attica/attica.bb | 0 .../tier1}/karchive/karchive-native.bb | 0 .../{framework-tier1 => kf5/tier1}/karchive/karchive.bb | 0 .../{framework-tier1 => kf5/tier1}/karchive/karchive.inc | 0 .../{framework-tier1 => kf5/tier1}/kcodecs/kcodecs.bb | 0 ...onfiggui-do-only-compile-in-case-sessions-are-aval.patch | 0 .../files/0002-keep-gui-stuff-out-of-native-build.patch | 0 .../tier1}/kconfig/kconfig-native.bb | 0 .../{framework-tier1 => kf5/tier1}/kconfig/kconfig.bb | 0 .../{framework-tier1 => kf5/tier1}/kconfig/kconfig.inc | 0 .../tier1}/kcoreaddons/kcoreaddons-native.bb | 0 .../tier1}/kcoreaddons/kcoreaddons.bb | 0 .../tier1}/kcoreaddons/kcoreaddons.inc | 0 .../tier1}/kdbusaddons/kdbusaddons.bb | 0 recipes-kde/{framework-tier1 => kf5/tier1}/kdnssd/kdnssd.bb | 0 .../{framework-tier1 => kf5/tier1}/kguiaddons/kguiaddons.bb | 0 .../files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch | 0 ...2-CMakeLists.txt-do-not-search-for-libintl-gettext.patch | 0 .../{framework-tier1 => kf5/tier1}/ki18n/ki18n-native.bb | 0 recipes-kde/{framework-tier1 => kf5/tier1}/ki18n/ki18n.bb | 0 recipes-kde/{framework-tier1 => kf5/tier1}/ki18n/ki18n.inc | 0 ...-not-search-for-Qt5X11Extras-in-x-less-environment.patch | 0 .../{framework-tier1 => kf5/tier1}/kidletime/kidletime.bb | 0 .../tier1}/kimageformats/kimageformats.bb | 0 .../tier1}/kitemmodels/kitemmodels.bb | 0 .../{framework-tier1 => kf5/tier1}/kitemviews/kitemviews.bb | 0 .../{framework-tier1 => kf5/tier1}/kplotting/kplotting.bb | 0 .../tier1}/kwidgetsaddons/kwidgetsaddons.bb | 0 .../tier1}/kwindowsystem/kwindowsystem.bb | 0 .../tier1}/networkmanager-qt/networkmanager-qt.bb | 0 recipes-kde/{framework-tier1 => kf5/tier1}/solid/solid.bb | 0 ...ild-and-install-parsetrigrams-only-we-need-the-nat.patch | 0 .../{framework-tier1 => kf5/tier1}/sonnet/sonnet-native.bb | 0 recipes-kde/{framework-tier1 => kf5/tier1}/sonnet/sonnet.bb | 0 .../{framework-tier1 => kf5/tier1}/sonnet/sonnet.inc | 0 .../tier1}/threadweaver/threadweaver.bb | 0 .../tier2}/kauth/files/0001-Make-autotests-optional.patch | 0 .../0002-align-installation-location-for-helpers.patch | 0 ...ild-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch | 0 .../{framework-tier2 => kf5/tier2}/kauth/kauth-native.bb | 0 recipes-kde/{framework-tier2 => kf5/tier2}/kauth/kauth.bb | 0 recipes-kde/{framework-tier2 => kf5/tier2}/kauth/kauth.inc | 0 .../tier2}/kcompletion/kcompletion.bb | 0 recipes-kde/{framework-tier2 => kf5/tier2}/kcrash/kcrash.bb | 0 .../files/0001-Add-cmdline-param-to-help-find-xsl.patch | 0 ...2-build-meinproc5-it-works-fine-in-our-environment.patch | 0 ...stall-docbookl10nhelper-we-need-the-native-one-for.patch | 0 .../kdoctools/files/0004-don-t-build-documentation.patch | 0 ...t-meinproc5-executable-so-that-it-can-be-found-for.patch | 0 .../tier2}/kdoctools/kdoctools-native.bb | 0 .../{framework-tier2 => kf5/tier2}/kdoctools/kdoctools.bb | 0 .../{framework-tier2 => kf5/tier2}/kdoctools/kdoctools.inc | 0 .../tier2}/kjobwidgets/kjobwidgets.bb | 0 .../{framework-tier2 => kf5/tier2}/kpackage/kpackage.bb | 0 recipes-kde/{framework-tier2 => kf5/tier2}/kpty/kpty.bb | 0 .../tier2}/kunitconversion/kunitconversion.bb | 0 ...place-try_run-by-try_compile-in-compiler-feature-c.patch | 0 .../tier3}/kactivities/kactivities.bb | 0 .../{framework-tier3 => kf5/tier3}/kbookmarks/kbookmarks.bb | 0 .../{framework-tier3 => kf5/tier3}/kcmutils/kcmutils.bb | 0 .../tier3}/kconfigwidgets/kconfigwidgets.bb | 0 .../tier3}/kdeclarative/kdeclarative.bb | 0 recipes-kde/{framework-tier3 => kf5/tier3}/kded/kded.bb | 0 ...0001-make-kplotting-and-kdewebkit-support-optional.patch | 0 ...t-kgendesignerplugin-executable-so-that-it-can-be-.patch | 0 .../tier3}/kdesignerplugin/kdesignerplugin-native.bb | 0 .../tier3}/kdesignerplugin/kdesignerplugin.bb | 0 .../tier3}/kdesignerplugin/kdesignerplugin.inc | 0 recipes-kde/{framework-tier3 => kf5/tier3}/kdesu/kdesu.bb | 0 .../{framework-tier3 => kf5/tier3}/kdewebkit/kdewebkit.bb | 0 .../{framework-tier3 => kf5/tier3}/kemoticons/kemoticons.bb | 0 ...CK-Add-a-stub-runtime-implementation-to-enable-bui.patch | 0 .../tier3}/kglobalaccel/kglobalaccel.bb | 0 .../tier3}/kiconthemes/kiconthemes.bb | 0 ...1-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch | 0 recipes-kde/{framework-tier3 => kf5/tier3}/kinit/kinit.bb | 0 recipes-kde/{framework-tier3 => kf5/tier3}/kio/kio.bb | 0 .../{framework-tier3 => kf5/tier3}/knewstuff/knewstuff.bb | 0 .../tier3}/knotifications/knotifications.bb | 0 .../tier3}/knotifyconfig/knotifyconfig.bb | 0 recipes-kde/{framework-tier3 => kf5/tier3}/kparts/kparts.bb | 0 .../{framework-tier3 => kf5/tier3}/kservice/kservice.bb | 0 ...tive-build-and-install-katehighlightingindexer-onl.patch | 0 .../tier3}/ktexteditor/ktexteditor-native.bb | 0 .../tier3}/ktexteditor/ktexteditor.bb | 0 .../tier3}/ktexteditor/ktexteditor.inc | 0 .../tier3}/ktextwidgets/ktextwidgets.bb | 0 ...d-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch | 0 .../{framework-tier3 => kf5/tier3}/kwallet/kwallet.bb | 0 ...rkaround-session-less-qtbase-required-for-pure-way.patch | 0 .../{framework-tier3 => kf5/tier3}/kxmlgui/kxmlgui.bb | 0 .../tier3}/plasma-framework/plasma-framework.bb | 0 .../extra-cmake-modules/extra-cmake-modules_1.7.0.bb | 0 .../0001-fix-configuration-build-on-x-less-systems.patch | 0 .../{untier => other}/libkscreen/libkscreen_5.2.90.bb | 0 recipes-kde/{untier => other}/phonon/phonon_4.8.bb | 0 .../{untier => other}/polkit-qt-1/polkit-qt-1_0.112.0.bb | 0 .../tier2}/kfilemetadata/kfilemetadata_5.6.0.bb | 0 .../{others-tier3 => plasma/tier3}/baloo/baloo_5.2.90.bb | 0 .../files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch | 0 .../files/0001-Initial-Wayland-support.patch | 0 .../0002-Do-check-for-kwin-only-in-case-X11-was-found.patch | 0 .../files/0003-Initial-Wayland-support-II.patch | 0 .../files/0004-Initial-Wayland-support-III.patch | 0 .../files/0005-Initial-Wayland-support-IV.patch | 0 .../files/0006-Initial-Wayland-support-V.patch | 0 ...CK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch | 0 .../files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch | 0 ...9-Stub-down-sessionrunner-in-x11-less-environments.patch | 0 .../plasma-workspace/files/0010-align-phonon-path.patch | 0 .../files/0011-kglobalaccel-add-wayland-stub.patch | 0 .../files/0012-Make-KWayland-optional.patch | 0 .../files/0013-fix-missuse-of-HAVE_X11.patch | 0 ...taengines-mouse-fix-build-in-X11-less-environments.patch | 0 .../tier3}/plasma-workspace/plasma-workspace_5.2.90.bb | 2 +- ...akeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch | 0 .../0002-PlasmaShell-and-PlasmaSurface-interfaces.patch | 0 .../kwayland/files/0003-PlasmaEffects-interface.patch | 0 .../untier/kwayland/files/0004-Server-side-interface.patch | 0 recipes-kde/{ => plasma}/untier/kwayland/kwayland_git.bb | 0 .../{ => plasma}/untier/libksysguard/libksysguard_git.bb | 0 135 files changed, 5 insertions(+), 3 deletions(-) rename recipes-kde/{ => kf5}/kf5-version.inc (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/kdelibs4support/kdelibs4support-native.bb (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/kdelibs4support/kdelibs4support.bb (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/kdelibs4support/kdelibs4support.inc (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/kjsembed/kjsembed.bb (100%) rename recipes-kde/{porting-aids-tier3 => kf5/poritng-aids-tier3}/krunner/krunner.bb (100%) rename recipes-kde/{ => kf5}/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch (100%) rename recipes-kde/{ => kf5}/porting-aids-tier1/kjs/kjs-native.bb (100%) rename recipes-kde/{ => kf5}/porting-aids-tier1/kjs/kjs.bb (100%) rename recipes-kde/{ => kf5}/porting-aids-tier1/kjs/kjs.inc (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/attica/attica.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/karchive/karchive-native.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/karchive/karchive.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/karchive/karchive.inc (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kcodecs/kcodecs.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kconfig/files/0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kconfig/files/0002-keep-gui-stuff-out-of-native-build.patch (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kconfig/kconfig-native.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kconfig/kconfig.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kconfig/kconfig.inc (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kcoreaddons/kcoreaddons-native.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kcoreaddons/kcoreaddons.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kcoreaddons/kcoreaddons.inc (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kdbusaddons/kdbusaddons.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kdnssd/kdnssd.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kguiaddons/kguiaddons.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/ki18n/ki18n-native.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/ki18n/ki18n.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/ki18n/ki18n.inc (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kidletime/kidletime.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kimageformats/kimageformats.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kitemmodels/kitemmodels.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kitemviews/kitemviews.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kplotting/kplotting.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kwidgetsaddons/kwidgetsaddons.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/kwindowsystem/kwindowsystem.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/networkmanager-qt/networkmanager-qt.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/solid/solid.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/sonnet/sonnet-native.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/sonnet/sonnet.bb (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/sonnet/sonnet.inc (100%) rename recipes-kde/{framework-tier1 => kf5/tier1}/threadweaver/threadweaver.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kauth/files/0001-Make-autotests-optional.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kauth/files/0002-align-installation-location-for-helpers.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kauth/kauth-native.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kauth/kauth.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kauth/kauth.inc (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kcompletion/kcompletion.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kcrash/kcrash.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/files/0004-don-t-build-documentation.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/kdoctools-native.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/kdoctools.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kdoctools/kdoctools.inc (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kjobwidgets/kjobwidgets.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kpackage/kpackage.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kpty/kpty.bb (100%) rename recipes-kde/{framework-tier2 => kf5/tier2}/kunitconversion/kunitconversion.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kactivities/files/0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kactivities/kactivities.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kbookmarks/kbookmarks.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kcmutils/kcmutils.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kconfigwidgets/kconfigwidgets.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdeclarative/kdeclarative.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kded/kded.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdesignerplugin/files/0001-make-kplotting-and-kdewebkit-support-optional.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdesignerplugin/files/0002-set-kgendesignerplugin-executable-so-that-it-can-be-.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdesignerplugin/kdesignerplugin-native.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdesignerplugin/kdesignerplugin.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdesignerplugin/kdesignerplugin.inc (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdesu/kdesu.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kdewebkit/kdewebkit.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kemoticons/kemoticons.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kglobalaccel/files/0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kglobalaccel/kglobalaccel.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kiconthemes/kiconthemes.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kinit/files/0001-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kinit/kinit.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kio/kio.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/knewstuff/knewstuff.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/knotifications/knotifications.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/knotifyconfig/knotifyconfig.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kparts/kparts.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kservice/kservice.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/ktexteditor/ktexteditor-native.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/ktexteditor/ktexteditor.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/ktexteditor/ktexteditor.inc (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/ktextwidgets/ktextwidgets.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kwallet/kwallet.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kxmlgui/files/0001-workaround-session-less-qtbase-required-for-pure-way.patch (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/kxmlgui/kxmlgui.bb (100%) rename recipes-kde/{framework-tier3 => kf5/tier3}/plasma-framework/plasma-framework.bb (100%) rename recipes-kde/{untier => other}/extra-cmake-modules/extra-cmake-modules_1.7.0.bb (100%) rename recipes-kde/{untier => other}/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch (100%) rename recipes-kde/{untier => other}/libkscreen/libkscreen_5.2.90.bb (100%) rename recipes-kde/{untier => other}/phonon/phonon_4.8.bb (100%) rename recipes-kde/{untier => other}/polkit-qt-1/polkit-qt-1_0.112.0.bb (100%) rename recipes-kde/{others-tier2 => plasma/tier2}/kfilemetadata/kfilemetadata_5.6.0.bb (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/baloo/baloo_5.2.90.bb (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0001-Initial-Wayland-support.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0003-Initial-Wayland-support-II.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0004-Initial-Wayland-support-III.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0006-Initial-Wayland-support-V.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0010-align-phonon-path.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0012-Make-KWayland-optional.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0013-fix-missuse-of-HAVE_X11.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/files/0014-dataengines-mouse-fix-build-in-X11-less-environments.patch (100%) rename recipes-kde/{others-tier3 => plasma/tier3}/plasma-workspace/plasma-workspace_5.2.90.bb (98%) rename recipes-kde/{ => plasma}/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch (100%) rename recipes-kde/{ => plasma}/untier/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch (100%) rename recipes-kde/{ => plasma}/untier/kwayland/files/0003-PlasmaEffects-interface.patch (100%) rename recipes-kde/{ => plasma}/untier/kwayland/files/0004-Server-side-interface.patch (100%) rename recipes-kde/{ => plasma}/untier/kwayland/kwayland_git.bb (100%) rename recipes-kde/{ => plasma}/untier/libksysguard/libksysguard_git.bb (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 68e1e426..081f0287 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,8 +1,10 @@ # We have a conf and classes directory, append to BBPATH BBPATH .= ":${LAYERDIR}" -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend" +# recipes +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*/*.bb" +# appends +BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend" BBFILE_COLLECTIONS += "meta-qt5-extra" BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/" diff --git a/recipes-kde/kf5-version.inc b/recipes-kde/kf5/kf5-version.inc similarity index 100% rename from recipes-kde/kf5-version.inc rename to recipes-kde/kf5/kf5-version.inc diff --git a/recipes-kde/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch b/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch similarity index 100% rename from recipes-kde/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch rename to recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch diff --git a/recipes-kde/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch similarity index 100% rename from recipes-kde/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch rename to recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch diff --git a/recipes-kde/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch b/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch similarity index 100% rename from recipes-kde/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch rename to recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch diff --git a/recipes-kde/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb b/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support-native.bb similarity index 100% rename from recipes-kde/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb rename to recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support-native.bb diff --git a/recipes-kde/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.bb similarity index 100% rename from recipes-kde/porting-aids-tier3/kdelibs4support/kdelibs4support.bb rename to recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.bb diff --git a/recipes-kde/porting-aids-tier3/kdelibs4support/kdelibs4support.inc b/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.inc similarity index 100% rename from recipes-kde/porting-aids-tier3/kdelibs4support/kdelibs4support.inc rename to recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.inc diff --git a/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/poritng-aids-tier3/kjsembed/kjsembed.bb similarity index 100% rename from recipes-kde/porting-aids-tier3/kjsembed/kjsembed.bb rename to recipes-kde/kf5/poritng-aids-tier3/kjsembed/kjsembed.bb diff --git a/recipes-kde/porting-aids-tier3/krunner/krunner.bb b/recipes-kde/kf5/poritng-aids-tier3/krunner/krunner.bb similarity index 100% rename from recipes-kde/porting-aids-tier3/krunner/krunner.bb rename to recipes-kde/kf5/poritng-aids-tier3/krunner/krunner.bb diff --git a/recipes-kde/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch b/recipes-kde/kf5/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch similarity index 100% rename from recipes-kde/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch rename to recipes-kde/kf5/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch diff --git a/recipes-kde/porting-aids-tier1/kjs/kjs-native.bb b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs-native.bb similarity index 100% rename from recipes-kde/porting-aids-tier1/kjs/kjs-native.bb rename to recipes-kde/kf5/porting-aids-tier1/kjs/kjs-native.bb diff --git a/recipes-kde/porting-aids-tier1/kjs/kjs.bb b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb similarity index 100% rename from recipes-kde/porting-aids-tier1/kjs/kjs.bb rename to recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb diff --git a/recipes-kde/porting-aids-tier1/kjs/kjs.inc b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc similarity index 100% rename from recipes-kde/porting-aids-tier1/kjs/kjs.inc rename to recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc diff --git a/recipes-kde/framework-tier1/attica/attica.bb b/recipes-kde/kf5/tier1/attica/attica.bb similarity index 100% rename from recipes-kde/framework-tier1/attica/attica.bb rename to recipes-kde/kf5/tier1/attica/attica.bb diff --git a/recipes-kde/framework-tier1/karchive/karchive-native.bb b/recipes-kde/kf5/tier1/karchive/karchive-native.bb similarity index 100% rename from recipes-kde/framework-tier1/karchive/karchive-native.bb rename to recipes-kde/kf5/tier1/karchive/karchive-native.bb diff --git a/recipes-kde/framework-tier1/karchive/karchive.bb b/recipes-kde/kf5/tier1/karchive/karchive.bb similarity index 100% rename from recipes-kde/framework-tier1/karchive/karchive.bb rename to recipes-kde/kf5/tier1/karchive/karchive.bb diff --git a/recipes-kde/framework-tier1/karchive/karchive.inc b/recipes-kde/kf5/tier1/karchive/karchive.inc similarity index 100% rename from recipes-kde/framework-tier1/karchive/karchive.inc rename to recipes-kde/kf5/tier1/karchive/karchive.inc diff --git a/recipes-kde/framework-tier1/kcodecs/kcodecs.bb b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb similarity index 100% rename from recipes-kde/framework-tier1/kcodecs/kcodecs.bb rename to recipes-kde/kf5/tier1/kcodecs/kcodecs.bb diff --git a/recipes-kde/framework-tier1/kconfig/files/0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch b/recipes-kde/kf5/tier1/kconfig/files/0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch similarity index 100% rename from recipes-kde/framework-tier1/kconfig/files/0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch rename to recipes-kde/kf5/tier1/kconfig/files/0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch diff --git a/recipes-kde/framework-tier1/kconfig/files/0002-keep-gui-stuff-out-of-native-build.patch b/recipes-kde/kf5/tier1/kconfig/files/0002-keep-gui-stuff-out-of-native-build.patch similarity index 100% rename from recipes-kde/framework-tier1/kconfig/files/0002-keep-gui-stuff-out-of-native-build.patch rename to recipes-kde/kf5/tier1/kconfig/files/0002-keep-gui-stuff-out-of-native-build.patch diff --git a/recipes-kde/framework-tier1/kconfig/kconfig-native.bb b/recipes-kde/kf5/tier1/kconfig/kconfig-native.bb similarity index 100% rename from recipes-kde/framework-tier1/kconfig/kconfig-native.bb rename to recipes-kde/kf5/tier1/kconfig/kconfig-native.bb diff --git a/recipes-kde/framework-tier1/kconfig/kconfig.bb b/recipes-kde/kf5/tier1/kconfig/kconfig.bb similarity index 100% rename from recipes-kde/framework-tier1/kconfig/kconfig.bb rename to recipes-kde/kf5/tier1/kconfig/kconfig.bb diff --git a/recipes-kde/framework-tier1/kconfig/kconfig.inc b/recipes-kde/kf5/tier1/kconfig/kconfig.inc similarity index 100% rename from recipes-kde/framework-tier1/kconfig/kconfig.inc rename to recipes-kde/kf5/tier1/kconfig/kconfig.inc diff --git a/recipes-kde/framework-tier1/kcoreaddons/kcoreaddons-native.bb b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons-native.bb similarity index 100% rename from recipes-kde/framework-tier1/kcoreaddons/kcoreaddons-native.bb rename to recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons-native.bb diff --git a/recipes-kde/framework-tier1/kcoreaddons/kcoreaddons.bb b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb similarity index 100% rename from recipes-kde/framework-tier1/kcoreaddons/kcoreaddons.bb rename to recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb diff --git a/recipes-kde/framework-tier1/kcoreaddons/kcoreaddons.inc b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc similarity index 100% rename from recipes-kde/framework-tier1/kcoreaddons/kcoreaddons.inc rename to recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc diff --git a/recipes-kde/framework-tier1/kdbusaddons/kdbusaddons.bb b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb similarity index 100% rename from recipes-kde/framework-tier1/kdbusaddons/kdbusaddons.bb rename to recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb diff --git a/recipes-kde/framework-tier1/kdnssd/kdnssd.bb b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb similarity index 100% rename from recipes-kde/framework-tier1/kdnssd/kdnssd.bb rename to recipes-kde/kf5/tier1/kdnssd/kdnssd.bb diff --git a/recipes-kde/framework-tier1/kguiaddons/kguiaddons.bb b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb similarity index 100% rename from recipes-kde/framework-tier1/kguiaddons/kguiaddons.bb rename to recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb diff --git a/recipes-kde/framework-tier1/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch b/recipes-kde/kf5/tier1/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch similarity index 100% rename from recipes-kde/framework-tier1/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch rename to recipes-kde/kf5/tier1/ki18n/files/0001-align-KI18N_MODULE_DIR-to-proper-path.patch diff --git a/recipes-kde/framework-tier1/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch b/recipes-kde/kf5/tier1/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch similarity index 100% rename from recipes-kde/framework-tier1/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch rename to recipes-kde/kf5/tier1/ki18n/files/0002-CMakeLists.txt-do-not-search-for-libintl-gettext.patch diff --git a/recipes-kde/framework-tier1/ki18n/ki18n-native.bb b/recipes-kde/kf5/tier1/ki18n/ki18n-native.bb similarity index 100% rename from recipes-kde/framework-tier1/ki18n/ki18n-native.bb rename to recipes-kde/kf5/tier1/ki18n/ki18n-native.bb diff --git a/recipes-kde/framework-tier1/ki18n/ki18n.bb b/recipes-kde/kf5/tier1/ki18n/ki18n.bb similarity index 100% rename from recipes-kde/framework-tier1/ki18n/ki18n.bb rename to recipes-kde/kf5/tier1/ki18n/ki18n.bb diff --git a/recipes-kde/framework-tier1/ki18n/ki18n.inc b/recipes-kde/kf5/tier1/ki18n/ki18n.inc similarity index 100% rename from recipes-kde/framework-tier1/ki18n/ki18n.inc rename to recipes-kde/kf5/tier1/ki18n/ki18n.inc diff --git a/recipes-kde/framework-tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch b/recipes-kde/kf5/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch similarity index 100% rename from recipes-kde/framework-tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch rename to recipes-kde/kf5/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch diff --git a/recipes-kde/framework-tier1/kidletime/kidletime.bb b/recipes-kde/kf5/tier1/kidletime/kidletime.bb similarity index 100% rename from recipes-kde/framework-tier1/kidletime/kidletime.bb rename to recipes-kde/kf5/tier1/kidletime/kidletime.bb diff --git a/recipes-kde/framework-tier1/kimageformats/kimageformats.bb b/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb similarity index 100% rename from recipes-kde/framework-tier1/kimageformats/kimageformats.bb rename to recipes-kde/kf5/tier1/kimageformats/kimageformats.bb diff --git a/recipes-kde/framework-tier1/kitemmodels/kitemmodels.bb b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb similarity index 100% rename from recipes-kde/framework-tier1/kitemmodels/kitemmodels.bb rename to recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb diff --git a/recipes-kde/framework-tier1/kitemviews/kitemviews.bb b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb similarity index 100% rename from recipes-kde/framework-tier1/kitemviews/kitemviews.bb rename to recipes-kde/kf5/tier1/kitemviews/kitemviews.bb diff --git a/recipes-kde/framework-tier1/kplotting/kplotting.bb b/recipes-kde/kf5/tier1/kplotting/kplotting.bb similarity index 100% rename from recipes-kde/framework-tier1/kplotting/kplotting.bb rename to recipes-kde/kf5/tier1/kplotting/kplotting.bb diff --git a/recipes-kde/framework-tier1/kwidgetsaddons/kwidgetsaddons.bb b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb similarity index 100% rename from recipes-kde/framework-tier1/kwidgetsaddons/kwidgetsaddons.bb rename to recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb diff --git a/recipes-kde/framework-tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb similarity index 100% rename from recipes-kde/framework-tier1/kwindowsystem/kwindowsystem.bb rename to recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb diff --git a/recipes-kde/framework-tier1/networkmanager-qt/networkmanager-qt.bb b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb similarity index 100% rename from recipes-kde/framework-tier1/networkmanager-qt/networkmanager-qt.bb rename to recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb diff --git a/recipes-kde/framework-tier1/solid/solid.bb b/recipes-kde/kf5/tier1/solid/solid.bb similarity index 100% rename from recipes-kde/framework-tier1/solid/solid.bb rename to recipes-kde/kf5/tier1/solid/solid.bb diff --git a/recipes-kde/framework-tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch b/recipes-kde/kf5/tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch similarity index 100% rename from recipes-kde/framework-tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch rename to recipes-kde/kf5/tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch diff --git a/recipes-kde/framework-tier1/sonnet/sonnet-native.bb b/recipes-kde/kf5/tier1/sonnet/sonnet-native.bb similarity index 100% rename from recipes-kde/framework-tier1/sonnet/sonnet-native.bb rename to recipes-kde/kf5/tier1/sonnet/sonnet-native.bb diff --git a/recipes-kde/framework-tier1/sonnet/sonnet.bb b/recipes-kde/kf5/tier1/sonnet/sonnet.bb similarity index 100% rename from recipes-kde/framework-tier1/sonnet/sonnet.bb rename to recipes-kde/kf5/tier1/sonnet/sonnet.bb diff --git a/recipes-kde/framework-tier1/sonnet/sonnet.inc b/recipes-kde/kf5/tier1/sonnet/sonnet.inc similarity index 100% rename from recipes-kde/framework-tier1/sonnet/sonnet.inc rename to recipes-kde/kf5/tier1/sonnet/sonnet.inc diff --git a/recipes-kde/framework-tier1/threadweaver/threadweaver.bb b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb similarity index 100% rename from recipes-kde/framework-tier1/threadweaver/threadweaver.bb rename to recipes-kde/kf5/tier1/threadweaver/threadweaver.bb diff --git a/recipes-kde/framework-tier2/kauth/files/0001-Make-autotests-optional.patch b/recipes-kde/kf5/tier2/kauth/files/0001-Make-autotests-optional.patch similarity index 100% rename from recipes-kde/framework-tier2/kauth/files/0001-Make-autotests-optional.patch rename to recipes-kde/kf5/tier2/kauth/files/0001-Make-autotests-optional.patch diff --git a/recipes-kde/framework-tier2/kauth/files/0002-align-installation-location-for-helpers.patch b/recipes-kde/kf5/tier2/kauth/files/0002-align-installation-location-for-helpers.patch similarity index 100% rename from recipes-kde/framework-tier2/kauth/files/0002-align-installation-location-for-helpers.patch rename to recipes-kde/kf5/tier2/kauth/files/0002-align-installation-location-for-helpers.patch diff --git a/recipes-kde/framework-tier2/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch b/recipes-kde/kf5/tier2/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch similarity index 100% rename from recipes-kde/framework-tier2/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch rename to recipes-kde/kf5/tier2/kauth/files/0003-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch diff --git a/recipes-kde/framework-tier2/kauth/kauth-native.bb b/recipes-kde/kf5/tier2/kauth/kauth-native.bb similarity index 100% rename from recipes-kde/framework-tier2/kauth/kauth-native.bb rename to recipes-kde/kf5/tier2/kauth/kauth-native.bb diff --git a/recipes-kde/framework-tier2/kauth/kauth.bb b/recipes-kde/kf5/tier2/kauth/kauth.bb similarity index 100% rename from recipes-kde/framework-tier2/kauth/kauth.bb rename to recipes-kde/kf5/tier2/kauth/kauth.bb diff --git a/recipes-kde/framework-tier2/kauth/kauth.inc b/recipes-kde/kf5/tier2/kauth/kauth.inc similarity index 100% rename from recipes-kde/framework-tier2/kauth/kauth.inc rename to recipes-kde/kf5/tier2/kauth/kauth.inc diff --git a/recipes-kde/framework-tier2/kcompletion/kcompletion.bb b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb similarity index 100% rename from recipes-kde/framework-tier2/kcompletion/kcompletion.bb rename to recipes-kde/kf5/tier2/kcompletion/kcompletion.bb diff --git a/recipes-kde/framework-tier2/kcrash/kcrash.bb b/recipes-kde/kf5/tier2/kcrash/kcrash.bb similarity index 100% rename from recipes-kde/framework-tier2/kcrash/kcrash.bb rename to recipes-kde/kf5/tier2/kcrash/kcrash.bb diff --git a/recipes-kde/framework-tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch b/recipes-kde/kf5/tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch diff --git a/recipes-kde/framework-tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch b/recipes-kde/kf5/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch diff --git a/recipes-kde/framework-tier2/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch b/recipes-kde/kf5/tier2/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch diff --git a/recipes-kde/framework-tier2/kdoctools/files/0004-don-t-build-documentation.patch b/recipes-kde/kf5/tier2/kdoctools/files/0004-don-t-build-documentation.patch similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/files/0004-don-t-build-documentation.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0004-don-t-build-documentation.patch diff --git a/recipes-kde/framework-tier2/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch b/recipes-kde/kf5/tier2/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch diff --git a/recipes-kde/framework-tier2/kdoctools/kdoctools-native.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/kdoctools-native.bb rename to recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb diff --git a/recipes-kde/framework-tier2/kdoctools/kdoctools.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/kdoctools.bb rename to recipes-kde/kf5/tier2/kdoctools/kdoctools.bb diff --git a/recipes-kde/framework-tier2/kdoctools/kdoctools.inc b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc similarity index 100% rename from recipes-kde/framework-tier2/kdoctools/kdoctools.inc rename to recipes-kde/kf5/tier2/kdoctools/kdoctools.inc diff --git a/recipes-kde/framework-tier2/kjobwidgets/kjobwidgets.bb b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb similarity index 100% rename from recipes-kde/framework-tier2/kjobwidgets/kjobwidgets.bb rename to recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb diff --git a/recipes-kde/framework-tier2/kpackage/kpackage.bb b/recipes-kde/kf5/tier2/kpackage/kpackage.bb similarity index 100% rename from recipes-kde/framework-tier2/kpackage/kpackage.bb rename to recipes-kde/kf5/tier2/kpackage/kpackage.bb diff --git a/recipes-kde/framework-tier2/kpty/kpty.bb b/recipes-kde/kf5/tier2/kpty/kpty.bb similarity index 100% rename from recipes-kde/framework-tier2/kpty/kpty.bb rename to recipes-kde/kf5/tier2/kpty/kpty.bb diff --git a/recipes-kde/framework-tier2/kunitconversion/kunitconversion.bb b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb similarity index 100% rename from recipes-kde/framework-tier2/kunitconversion/kunitconversion.bb rename to recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb diff --git a/recipes-kde/framework-tier3/kactivities/files/0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch b/recipes-kde/kf5/tier3/kactivities/files/0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch similarity index 100% rename from recipes-kde/framework-tier3/kactivities/files/0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch rename to recipes-kde/kf5/tier3/kactivities/files/0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch diff --git a/recipes-kde/framework-tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb similarity index 100% rename from recipes-kde/framework-tier3/kactivities/kactivities.bb rename to recipes-kde/kf5/tier3/kactivities/kactivities.bb diff --git a/recipes-kde/framework-tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb similarity index 100% rename from recipes-kde/framework-tier3/kbookmarks/kbookmarks.bb rename to recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb diff --git a/recipes-kde/framework-tier3/kcmutils/kcmutils.bb b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb similarity index 100% rename from recipes-kde/framework-tier3/kcmutils/kcmutils.bb rename to recipes-kde/kf5/tier3/kcmutils/kcmutils.bb diff --git a/recipes-kde/framework-tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb similarity index 100% rename from recipes-kde/framework-tier3/kconfigwidgets/kconfigwidgets.bb rename to recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb diff --git a/recipes-kde/framework-tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb similarity index 100% rename from recipes-kde/framework-tier3/kdeclarative/kdeclarative.bb rename to recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb diff --git a/recipes-kde/framework-tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb similarity index 100% rename from recipes-kde/framework-tier3/kded/kded.bb rename to recipes-kde/kf5/tier3/kded/kded.bb diff --git a/recipes-kde/framework-tier3/kdesignerplugin/files/0001-make-kplotting-and-kdewebkit-support-optional.patch b/recipes-kde/kf5/tier3/kdesignerplugin/files/0001-make-kplotting-and-kdewebkit-support-optional.patch similarity index 100% rename from recipes-kde/framework-tier3/kdesignerplugin/files/0001-make-kplotting-and-kdewebkit-support-optional.patch rename to recipes-kde/kf5/tier3/kdesignerplugin/files/0001-make-kplotting-and-kdewebkit-support-optional.patch diff --git a/recipes-kde/framework-tier3/kdesignerplugin/files/0002-set-kgendesignerplugin-executable-so-that-it-can-be-.patch b/recipes-kde/kf5/tier3/kdesignerplugin/files/0002-set-kgendesignerplugin-executable-so-that-it-can-be-.patch similarity index 100% rename from recipes-kde/framework-tier3/kdesignerplugin/files/0002-set-kgendesignerplugin-executable-so-that-it-can-be-.patch rename to recipes-kde/kf5/tier3/kdesignerplugin/files/0002-set-kgendesignerplugin-executable-so-that-it-can-be-.patch diff --git a/recipes-kde/framework-tier3/kdesignerplugin/kdesignerplugin-native.bb b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin-native.bb similarity index 100% rename from recipes-kde/framework-tier3/kdesignerplugin/kdesignerplugin-native.bb rename to recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin-native.bb diff --git a/recipes-kde/framework-tier3/kdesignerplugin/kdesignerplugin.bb b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb similarity index 100% rename from recipes-kde/framework-tier3/kdesignerplugin/kdesignerplugin.bb rename to recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb diff --git a/recipes-kde/framework-tier3/kdesignerplugin/kdesignerplugin.inc b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc similarity index 100% rename from recipes-kde/framework-tier3/kdesignerplugin/kdesignerplugin.inc rename to recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc diff --git a/recipes-kde/framework-tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb similarity index 100% rename from recipes-kde/framework-tier3/kdesu/kdesu.bb rename to recipes-kde/kf5/tier3/kdesu/kdesu.bb diff --git a/recipes-kde/framework-tier3/kdewebkit/kdewebkit.bb b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb similarity index 100% rename from recipes-kde/framework-tier3/kdewebkit/kdewebkit.bb rename to recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb diff --git a/recipes-kde/framework-tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb similarity index 100% rename from recipes-kde/framework-tier3/kemoticons/kemoticons.bb rename to recipes-kde/kf5/tier3/kemoticons/kemoticons.bb diff --git a/recipes-kde/framework-tier3/kglobalaccel/files/0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch b/recipes-kde/kf5/tier3/kglobalaccel/files/0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch similarity index 100% rename from recipes-kde/framework-tier3/kglobalaccel/files/0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch rename to recipes-kde/kf5/tier3/kglobalaccel/files/0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch diff --git a/recipes-kde/framework-tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb similarity index 100% rename from recipes-kde/framework-tier3/kglobalaccel/kglobalaccel.bb rename to recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb diff --git a/recipes-kde/framework-tier3/kiconthemes/kiconthemes.bb b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb similarity index 100% rename from recipes-kde/framework-tier3/kiconthemes/kiconthemes.bb rename to recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb diff --git a/recipes-kde/framework-tier3/kinit/files/0001-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch b/recipes-kde/kf5/tier3/kinit/files/0001-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch similarity index 100% rename from recipes-kde/framework-tier3/kinit/files/0001-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch rename to recipes-kde/kf5/tier3/kinit/files/0001-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch diff --git a/recipes-kde/framework-tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb similarity index 100% rename from recipes-kde/framework-tier3/kinit/kinit.bb rename to recipes-kde/kf5/tier3/kinit/kinit.bb diff --git a/recipes-kde/framework-tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb similarity index 100% rename from recipes-kde/framework-tier3/kio/kio.bb rename to recipes-kde/kf5/tier3/kio/kio.bb diff --git a/recipes-kde/framework-tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb similarity index 100% rename from recipes-kde/framework-tier3/knewstuff/knewstuff.bb rename to recipes-kde/kf5/tier3/knewstuff/knewstuff.bb diff --git a/recipes-kde/framework-tier3/knotifications/knotifications.bb b/recipes-kde/kf5/tier3/knotifications/knotifications.bb similarity index 100% rename from recipes-kde/framework-tier3/knotifications/knotifications.bb rename to recipes-kde/kf5/tier3/knotifications/knotifications.bb diff --git a/recipes-kde/framework-tier3/knotifyconfig/knotifyconfig.bb b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb similarity index 100% rename from recipes-kde/framework-tier3/knotifyconfig/knotifyconfig.bb rename to recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb diff --git a/recipes-kde/framework-tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb similarity index 100% rename from recipes-kde/framework-tier3/kparts/kparts.bb rename to recipes-kde/kf5/tier3/kparts/kparts.bb diff --git a/recipes-kde/framework-tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb similarity index 100% rename from recipes-kde/framework-tier3/kservice/kservice.bb rename to recipes-kde/kf5/tier3/kservice/kservice.bb diff --git a/recipes-kde/framework-tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch b/recipes-kde/kf5/tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch similarity index 100% rename from recipes-kde/framework-tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch rename to recipes-kde/kf5/tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch diff --git a/recipes-kde/framework-tier3/ktexteditor/ktexteditor-native.bb b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor-native.bb similarity index 100% rename from recipes-kde/framework-tier3/ktexteditor/ktexteditor-native.bb rename to recipes-kde/kf5/tier3/ktexteditor/ktexteditor-native.bb diff --git a/recipes-kde/framework-tier3/ktexteditor/ktexteditor.bb b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb similarity index 100% rename from recipes-kde/framework-tier3/ktexteditor/ktexteditor.bb rename to recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb diff --git a/recipes-kde/framework-tier3/ktexteditor/ktexteditor.inc b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc similarity index 100% rename from recipes-kde/framework-tier3/ktexteditor/ktexteditor.inc rename to recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc diff --git a/recipes-kde/framework-tier3/ktextwidgets/ktextwidgets.bb b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb similarity index 100% rename from recipes-kde/framework-tier3/ktextwidgets/ktextwidgets.bb rename to recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb diff --git a/recipes-kde/framework-tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch b/recipes-kde/kf5/tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch similarity index 100% rename from recipes-kde/framework-tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch rename to recipes-kde/kf5/tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch diff --git a/recipes-kde/framework-tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb similarity index 100% rename from recipes-kde/framework-tier3/kwallet/kwallet.bb rename to recipes-kde/kf5/tier3/kwallet/kwallet.bb diff --git a/recipes-kde/framework-tier3/kxmlgui/files/0001-workaround-session-less-qtbase-required-for-pure-way.patch b/recipes-kde/kf5/tier3/kxmlgui/files/0001-workaround-session-less-qtbase-required-for-pure-way.patch similarity index 100% rename from recipes-kde/framework-tier3/kxmlgui/files/0001-workaround-session-less-qtbase-required-for-pure-way.patch rename to recipes-kde/kf5/tier3/kxmlgui/files/0001-workaround-session-less-qtbase-required-for-pure-way.patch diff --git a/recipes-kde/framework-tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb similarity index 100% rename from recipes-kde/framework-tier3/kxmlgui/kxmlgui.bb rename to recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb diff --git a/recipes-kde/framework-tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb similarity index 100% rename from recipes-kde/framework-tier3/plasma-framework/plasma-framework.bb rename to recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb diff --git a/recipes-kde/untier/extra-cmake-modules/extra-cmake-modules_1.7.0.bb b/recipes-kde/other/extra-cmake-modules/extra-cmake-modules_1.7.0.bb similarity index 100% rename from recipes-kde/untier/extra-cmake-modules/extra-cmake-modules_1.7.0.bb rename to recipes-kde/other/extra-cmake-modules/extra-cmake-modules_1.7.0.bb diff --git a/recipes-kde/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch b/recipes-kde/other/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch similarity index 100% rename from recipes-kde/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch rename to recipes-kde/other/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch diff --git a/recipes-kde/untier/libkscreen/libkscreen_5.2.90.bb b/recipes-kde/other/libkscreen/libkscreen_5.2.90.bb similarity index 100% rename from recipes-kde/untier/libkscreen/libkscreen_5.2.90.bb rename to recipes-kde/other/libkscreen/libkscreen_5.2.90.bb diff --git a/recipes-kde/untier/phonon/phonon_4.8.bb b/recipes-kde/other/phonon/phonon_4.8.bb similarity index 100% rename from recipes-kde/untier/phonon/phonon_4.8.bb rename to recipes-kde/other/phonon/phonon_4.8.bb diff --git a/recipes-kde/untier/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb similarity index 100% rename from recipes-kde/untier/polkit-qt-1/polkit-qt-1_0.112.0.bb rename to recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb diff --git a/recipes-kde/others-tier2/kfilemetadata/kfilemetadata_5.6.0.bb b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata_5.6.0.bb similarity index 100% rename from recipes-kde/others-tier2/kfilemetadata/kfilemetadata_5.6.0.bb rename to recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata_5.6.0.bb diff --git a/recipes-kde/others-tier3/baloo/baloo_5.2.90.bb b/recipes-kde/plasma/tier3/baloo/baloo_5.2.90.bb similarity index 100% rename from recipes-kde/others-tier3/baloo/baloo_5.2.90.bb rename to recipes-kde/plasma/tier3/baloo/baloo_5.2.90.bb diff --git a/recipes-kde/others-tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/plasma/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch similarity index 100% rename from recipes-kde/others-tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch rename to recipes-kde/plasma/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0010-align-phonon-path.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0010-align-phonon-path.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0010-align-phonon-path.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0010-align-phonon-path.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0013-fix-missuse-of-HAVE_X11.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0013-fix-missuse-of-HAVE_X11.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0013-fix-missuse-of-HAVE_X11.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0013-fix-missuse-of-HAVE_X11.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0014-dataengines-mouse-fix-build-in-X11-less-environments.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0014-dataengines-mouse-fix-build-in-X11-less-environments.patch similarity index 100% rename from recipes-kde/others-tier3/plasma-workspace/files/0014-dataengines-mouse-fix-build-in-X11-less-environments.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0014-dataengines-mouse-fix-build-in-X11-less-environments.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/plasma-workspace_5.2.90.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace_5.2.90.bb similarity index 98% rename from recipes-kde/others-tier3/plasma-workspace/plasma-workspace_5.2.90.bb rename to recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace_5.2.90.bb index 610dd1ea..9981b3fa 100644 --- a/recipes-kde/others-tier3/plasma-workspace/plasma-workspace_5.2.90.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace_5.2.90.bb @@ -29,7 +29,7 @@ DEPENDS += " \ kcrash \ libksysguard \ libkscreen \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb kwin", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \ zlib \ " diff --git a/recipes-kde/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch b/recipes-kde/plasma/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch similarity index 100% rename from recipes-kde/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch rename to recipes-kde/plasma/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch diff --git a/recipes-kde/untier/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch b/recipes-kde/plasma/untier/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch similarity index 100% rename from recipes-kde/untier/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch rename to recipes-kde/plasma/untier/kwayland/files/0002-PlasmaShell-and-PlasmaSurface-interfaces.patch diff --git a/recipes-kde/untier/kwayland/files/0003-PlasmaEffects-interface.patch b/recipes-kde/plasma/untier/kwayland/files/0003-PlasmaEffects-interface.patch similarity index 100% rename from recipes-kde/untier/kwayland/files/0003-PlasmaEffects-interface.patch rename to recipes-kde/plasma/untier/kwayland/files/0003-PlasmaEffects-interface.patch diff --git a/recipes-kde/untier/kwayland/files/0004-Server-side-interface.patch b/recipes-kde/plasma/untier/kwayland/files/0004-Server-side-interface.patch similarity index 100% rename from recipes-kde/untier/kwayland/files/0004-Server-side-interface.patch rename to recipes-kde/plasma/untier/kwayland/files/0004-Server-side-interface.patch diff --git a/recipes-kde/untier/kwayland/kwayland_git.bb b/recipes-kde/plasma/untier/kwayland/kwayland_git.bb similarity index 100% rename from recipes-kde/untier/kwayland/kwayland_git.bb rename to recipes-kde/plasma/untier/kwayland/kwayland_git.bb diff --git a/recipes-kde/untier/libksysguard/libksysguard_git.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard_git.bb similarity index 100% rename from recipes-kde/untier/libksysguard/libksysguard_git.bb rename to recipes-kde/plasma/untier/libksysguard/libksysguard_git.bb