diff --git a/conf/layer.conf b/conf/layer.conf index 183e38cb..fad3e940 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -2,7 +2,7 @@ BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-maui" BBFILE_PATTERN_meta-maui := "^${LAYERDIR}/" diff --git a/recipes-kde-base/attica/attica_5.5.0.bb b/recipes-kde-framework/tier1/attica/attica_5.5.0.bb similarity index 100% rename from recipes-kde-base/attica/attica_5.5.0.bb rename to recipes-kde-framework/tier1/attica/attica_5.5.0.bb diff --git a/recipes-kde-base/karchive/karchive-native.bb b/recipes-kde-framework/tier1/karchive/karchive-native.bb similarity index 100% rename from recipes-kde-base/karchive/karchive-native.bb rename to recipes-kde-framework/tier1/karchive/karchive-native.bb diff --git a/recipes-kde-base/karchive/karchive.bb b/recipes-kde-framework/tier1/karchive/karchive.bb similarity index 100% rename from recipes-kde-base/karchive/karchive.bb rename to recipes-kde-framework/tier1/karchive/karchive.bb diff --git a/recipes-kde-base/karchive/karchive.inc b/recipes-kde-framework/tier1/karchive/karchive.inc similarity index 100% rename from recipes-kde-base/karchive/karchive.inc rename to recipes-kde-framework/tier1/karchive/karchive.inc diff --git a/recipes-kde-base/kcodecs/kcodecs_5.5.0.bb b/recipes-kde-framework/tier1/kcodecs/kcodecs_5.5.0.bb similarity index 100% rename from recipes-kde-base/kcodecs/kcodecs_5.5.0.bb rename to recipes-kde-framework/tier1/kcodecs/kcodecs_5.5.0.bb diff --git a/recipes-kde-base/kconfig/files/0001-Make-sessionConfig-optional.patch b/recipes-kde-framework/tier1/kconfig/files/0001-Make-sessionConfig-optional.patch similarity index 100% rename from recipes-kde-base/kconfig/files/0001-Make-sessionConfig-optional.patch rename to recipes-kde-framework/tier1/kconfig/files/0001-Make-sessionConfig-optional.patch diff --git a/recipes-kde-base/kconfig/kconfig-native.bb b/recipes-kde-framework/tier1/kconfig/kconfig-native.bb similarity index 100% rename from recipes-kde-base/kconfig/kconfig-native.bb rename to recipes-kde-framework/tier1/kconfig/kconfig-native.bb diff --git a/recipes-kde-base/kconfig/kconfig.bb b/recipes-kde-framework/tier1/kconfig/kconfig.bb similarity index 100% rename from recipes-kde-base/kconfig/kconfig.bb rename to recipes-kde-framework/tier1/kconfig/kconfig.bb diff --git a/recipes-kde-base/kconfig/kconfig.inc b/recipes-kde-framework/tier1/kconfig/kconfig.inc similarity index 100% rename from recipes-kde-base/kconfig/kconfig.inc rename to recipes-kde-framework/tier1/kconfig/kconfig.inc diff --git a/recipes-kde-base/kcoreaddons/kcoreaddons-native.bb b/recipes-kde-framework/tier1/kcoreaddons/kcoreaddons-native.bb similarity index 100% rename from recipes-kde-base/kcoreaddons/kcoreaddons-native.bb rename to recipes-kde-framework/tier1/kcoreaddons/kcoreaddons-native.bb diff --git a/recipes-kde-base/kcoreaddons/kcoreaddons.bb b/recipes-kde-framework/tier1/kcoreaddons/kcoreaddons.bb similarity index 100% rename from recipes-kde-base/kcoreaddons/kcoreaddons.bb rename to recipes-kde-framework/tier1/kcoreaddons/kcoreaddons.bb diff --git a/recipes-kde-base/kcoreaddons/kcoreaddons.inc b/recipes-kde-framework/tier1/kcoreaddons/kcoreaddons.inc similarity index 100% rename from recipes-kde-base/kcoreaddons/kcoreaddons.inc rename to recipes-kde-framework/tier1/kcoreaddons/kcoreaddons.inc diff --git a/recipes-kde-base/kdbusaddons/kdbusaddons_5.5.0.bb b/recipes-kde-framework/tier1/kdbusaddons/kdbusaddons_5.5.0.bb similarity index 100% rename from recipes-kde-base/kdbusaddons/kdbusaddons_5.5.0.bb rename to recipes-kde-framework/tier1/kdbusaddons/kdbusaddons_5.5.0.bb diff --git a/recipes-kde-base/kglobalaccel/kglobalaccel_5.5.0.bb b/recipes-kde-framework/tier1/kglobalaccel/kglobalaccel_5.5.0.bb similarity index 100% rename from recipes-kde-base/kglobalaccel/kglobalaccel_5.5.0.bb rename to recipes-kde-framework/tier1/kglobalaccel/kglobalaccel_5.5.0.bb diff --git a/recipes-kde-base/kguiaddons/kguiaddons_5.5.0.bb b/recipes-kde-framework/tier1/kguiaddons/kguiaddons_5.5.0.bb similarity index 100% rename from recipes-kde-base/kguiaddons/kguiaddons_5.5.0.bb rename to recipes-kde-framework/tier1/kguiaddons/kguiaddons_5.5.0.bb diff --git a/recipes-kde-base/ki18n/files/0001-set-mkspec-path-as-set-in-meta-qt5.patch b/recipes-kde-framework/tier1/ki18n/files/0001-set-mkspec-path-as-set-in-meta-qt5.patch similarity index 100% rename from recipes-kde-base/ki18n/files/0001-set-mkspec-path-as-set-in-meta-qt5.patch rename to recipes-kde-framework/tier1/ki18n/files/0001-set-mkspec-path-as-set-in-meta-qt5.patch diff --git a/recipes-kde-base/ki18n/files/0002-align-KI18N_MODULE_DIR-to-proper-path.patch b/recipes-kde-framework/tier1/ki18n/files/0002-align-KI18N_MODULE_DIR-to-proper-path.patch similarity index 100% rename from recipes-kde-base/ki18n/files/0002-align-KI18N_MODULE_DIR-to-proper-path.patch rename to recipes-kde-framework/tier1/ki18n/files/0002-align-KI18N_MODULE_DIR-to-proper-path.patch diff --git a/recipes-kde-base/ki18n/ki18n-native.bb b/recipes-kde-framework/tier1/ki18n/ki18n-native.bb similarity index 100% rename from recipes-kde-base/ki18n/ki18n-native.bb rename to recipes-kde-framework/tier1/ki18n/ki18n-native.bb diff --git a/recipes-kde-base/ki18n/ki18n.bb b/recipes-kde-framework/tier1/ki18n/ki18n.bb similarity index 100% rename from recipes-kde-base/ki18n/ki18n.bb rename to recipes-kde-framework/tier1/ki18n/ki18n.bb diff --git a/recipes-kde-base/ki18n/ki18n.inc b/recipes-kde-framework/tier1/ki18n/ki18n.inc similarity index 100% rename from recipes-kde-base/ki18n/ki18n.inc rename to recipes-kde-framework/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-framework/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch new file mode 100644 index 00000000..bb0c211f --- /dev/null +++ b/recipes-kde-framework/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch @@ -0,0 +1,37 @@ +From 4f41c2cffc007a927bda10db3737c98dbefa187f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 3 Dec 2014 14:52:14 +0100 +Subject: [PATCH] Do not search for Qt5X11Extras in x-less environments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d89bb9f..cfdb8e0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,7 @@ set(REQUIRED_QT_VERSION 5.2.0) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) + + if(NOT WIN32 AND NOT APPLE) +- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras DBus) ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + endif() + + if(APPLE) +@@ -42,6 +42,7 @@ if(NOT APPLE) + endif() + + if(X11_FOUND) ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + find_package(XCB COMPONENTS XCB SYNC) + find_package(X11_XCB) + if (X11_XSync_FOUND AND XCB_XCB_FOUND AND X11_XCB_FOUND AND XCB_SYNC_FOUND) +-- +1.8.3.1 + diff --git a/recipes-kde-framework/tier1/kidletime/kidletime_5.5.0.bb b/recipes-kde-framework/tier1/kidletime/kidletime_5.5.0.bb new file mode 100644 index 00000000..de245108 --- /dev/null +++ b/recipes-kde-framework/tier1/kidletime/kidletime_5.5.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Monitoring user activity" +LICENSE = "GPLv2 | LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +inherit kde cmake-lib + +SRC_URI += "file://0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch" +SRCREV = "31e0bc0429000c93da91cba8df79b08e1afd6a9b" + +# cross libs / headers +CMAKE_HIDE_ERROR[1] = "KF5IdleTime, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" +CMAKE_HIDE_ERROR[2] = "KF5IdleTime, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-kde-base/kitemviews/kitemviews_5.5.0.bb b/recipes-kde-framework/tier1/kitemviews/kitemviews_5.5.0.bb similarity index 100% rename from recipes-kde-base/kitemviews/kitemviews_5.5.0.bb rename to recipes-kde-framework/tier1/kitemviews/kitemviews_5.5.0.bb diff --git a/recipes-kde-base/kwidgetsaddons/kwidgetsaddons_5.5.0.bb b/recipes-kde-framework/tier1/kwidgetsaddons/kwidgetsaddons_5.5.0.bb similarity index 100% rename from recipes-kde-base/kwidgetsaddons/kwidgetsaddons_5.5.0.bb rename to recipes-kde-framework/tier1/kwidgetsaddons/kwidgetsaddons_5.5.0.bb diff --git a/recipes-kde-base/kwindowsystem/kwindowsystem_5.5.0.bb b/recipes-kde-framework/tier1/kwindowsystem/kwindowsystem_5.5.0.bb similarity index 100% rename from recipes-kde-base/kwindowsystem/kwindowsystem_5.5.0.bb rename to recipes-kde-framework/tier1/kwindowsystem/kwindowsystem_5.5.0.bb diff --git a/recipes-kde-base/solid/solid_5.5.0.bb b/recipes-kde-framework/tier1/solid/solid_5.5.0.bb similarity index 100% rename from recipes-kde-base/solid/solid_5.5.0.bb rename to recipes-kde-framework/tier1/solid/solid_5.5.0.bb diff --git a/recipes-kde-base/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch b/recipes-kde-framework/tier1/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch similarity index 100% rename from recipes-kde-base/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch rename to recipes-kde-framework/tier1/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch diff --git a/recipes-kde-base/sonnet/sonnet-native.bb b/recipes-kde-framework/tier1/sonnet/sonnet-native.bb similarity index 100% rename from recipes-kde-base/sonnet/sonnet-native.bb rename to recipes-kde-framework/tier1/sonnet/sonnet-native.bb diff --git a/recipes-kde-base/sonnet/sonnet.bb b/recipes-kde-framework/tier1/sonnet/sonnet.bb similarity index 100% rename from recipes-kde-base/sonnet/sonnet.bb rename to recipes-kde-framework/tier1/sonnet/sonnet.bb diff --git a/recipes-kde-base/sonnet/sonnet.inc b/recipes-kde-framework/tier1/sonnet/sonnet.inc similarity index 100% rename from recipes-kde-base/sonnet/sonnet.inc rename to recipes-kde-framework/tier1/sonnet/sonnet.inc diff --git a/recipes-kde-base/kauth/files/0001-Make-autotests-optional.patch b/recipes-kde-framework/tier2/kauth/files/0001-Make-autotests-optional.patch similarity index 100% rename from recipes-kde-base/kauth/files/0001-Make-autotests-optional.patch rename to recipes-kde-framework/tier2/kauth/files/0001-Make-autotests-optional.patch diff --git a/recipes-kde-base/kauth/kauth-native.bb b/recipes-kde-framework/tier2/kauth/kauth-native.bb similarity index 100% rename from recipes-kde-base/kauth/kauth-native.bb rename to recipes-kde-framework/tier2/kauth/kauth-native.bb diff --git a/recipes-kde-base/kauth/kauth.bb b/recipes-kde-framework/tier2/kauth/kauth.bb similarity index 100% rename from recipes-kde-base/kauth/kauth.bb rename to recipes-kde-framework/tier2/kauth/kauth.bb diff --git a/recipes-kde-base/kauth/kauth.inc b/recipes-kde-framework/tier2/kauth/kauth.inc similarity index 100% rename from recipes-kde-base/kauth/kauth.inc rename to recipes-kde-framework/tier2/kauth/kauth.inc diff --git a/recipes-kde-base/kcompletion/kcompletion_5.5.0.bb b/recipes-kde-framework/tier2/kcompletion/kcompletion_5.5.0.bb similarity index 100% rename from recipes-kde-base/kcompletion/kcompletion_5.5.0.bb rename to recipes-kde-framework/tier2/kcompletion/kcompletion_5.5.0.bb diff --git a/recipes-kde-base/kcrash/kcrash_5.5.0.bb b/recipes-kde-framework/tier2/kcrash/kcrash_5.5.0.bb similarity index 100% rename from recipes-kde-base/kcrash/kcrash_5.5.0.bb rename to recipes-kde-framework/tier2/kcrash/kcrash_5.5.0.bb diff --git a/recipes-kde-base/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch b/recipes-kde-framework/tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch similarity index 100% rename from recipes-kde-base/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch rename to recipes-kde-framework/tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch diff --git a/recipes-kde-base/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch b/recipes-kde-framework/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch similarity index 100% rename from recipes-kde-base/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch rename to recipes-kde-framework/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch diff --git a/recipes-kde-base/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch b/recipes-kde-framework/tier2/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch similarity index 100% rename from recipes-kde-base/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch rename to recipes-kde-framework/tier2/kdoctools/files/0003-install-docbookl10nhelper-we-need-the-native-one-for.patch diff --git a/recipes-kde-base/kdoctools/files/0004-don-t-build-documentation.patch b/recipes-kde-framework/tier2/kdoctools/files/0004-don-t-build-documentation.patch similarity index 100% rename from recipes-kde-base/kdoctools/files/0004-don-t-build-documentation.patch rename to recipes-kde-framework/tier2/kdoctools/files/0004-don-t-build-documentation.patch diff --git a/recipes-kde-base/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch b/recipes-kde-framework/tier2/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch similarity index 100% rename from recipes-kde-base/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch rename to recipes-kde-framework/tier2/kdoctools/files/0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch diff --git a/recipes-kde-base/kdoctools/kdoctools-native.bb b/recipes-kde-framework/tier2/kdoctools/kdoctools-native.bb similarity index 100% rename from recipes-kde-base/kdoctools/kdoctools-native.bb rename to recipes-kde-framework/tier2/kdoctools/kdoctools-native.bb diff --git a/recipes-kde-base/kdoctools/kdoctools.bb b/recipes-kde-framework/tier2/kdoctools/kdoctools.bb similarity index 100% rename from recipes-kde-base/kdoctools/kdoctools.bb rename to recipes-kde-framework/tier2/kdoctools/kdoctools.bb diff --git a/recipes-kde-base/kdoctools/kdoctools.inc b/recipes-kde-framework/tier2/kdoctools/kdoctools.inc similarity index 100% rename from recipes-kde-base/kdoctools/kdoctools.inc rename to recipes-kde-framework/tier2/kdoctools/kdoctools.inc diff --git a/recipes-kde-base/kjobwidgets/kjobwidgets_5.5.0.bb b/recipes-kde-framework/tier2/kjobwidgets/kjobwidgets_5.5.0.bb similarity index 100% rename from recipes-kde-base/kjobwidgets/kjobwidgets_5.5.0.bb rename to recipes-kde-framework/tier2/kjobwidgets/kjobwidgets_5.5.0.bb diff --git a/recipes-kde-base/kbookmarks/kbookmarks_5.5.0.bb b/recipes-kde-framework/tier3/kbookmarks/kbookmarks_5.5.0.bb similarity index 100% rename from recipes-kde-base/kbookmarks/kbookmarks_5.5.0.bb rename to recipes-kde-framework/tier3/kbookmarks/kbookmarks_5.5.0.bb diff --git a/recipes-kde-base/kconfigwidgets/kconfigwidgets_5.5.0.bb b/recipes-kde-framework/tier3/kconfigwidgets/kconfigwidgets_5.5.0.bb similarity index 100% rename from recipes-kde-base/kconfigwidgets/kconfigwidgets_5.5.0.bb rename to recipes-kde-framework/tier3/kconfigwidgets/kconfigwidgets_5.5.0.bb diff --git a/recipes-kde-base/kiconthemes/kiconthemes_5.5.0.bb b/recipes-kde-framework/tier3/kiconthemes/kiconthemes_5.5.0.bb similarity index 100% rename from recipes-kde-base/kiconthemes/kiconthemes_5.5.0.bb rename to recipes-kde-framework/tier3/kiconthemes/kiconthemes_5.5.0.bb diff --git a/recipes-kde-base/kio/kio_5.5.0.bb b/recipes-kde-framework/tier3/kio/kio_5.5.0.bb similarity index 58% rename from recipes-kde-base/kio/kio_5.5.0.bb rename to recipes-kde-framework/tier3/kio/kio_5.5.0.bb index 51e846e5..8b874f08 100644 --- a/recipes-kde-base/kio/kio_5.5.0.bb +++ b/recipes-kde-framework/tier3/kio/kio_5.5.0.bb @@ -6,7 +6,28 @@ LIC_FILES_CHKSUM = " \ inherit kde cmake-lib -DEPENDS += "karchive kbookmarks" +DEPENDS += " \ + karchive \ + kbookmarks \ + kcodecs \ + kcompletion \ + kconfig \ + kconfigwidgets \ + kcoreaddons \ + kdbusaddons \ + kdoctools \ + ki18n \ + kiconthemes \ + kitemviews \ + kjobwidgets \ + knotifications \ + kservice \ + solid \ + kwidgetsaddons \ + kwindowsystem \ + kxmlgui \ + kwallet \ +" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5I18n, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde-framework/tier3/knotifications/knotifications_5.5.0.bb b/recipes-kde-framework/tier3/knotifications/knotifications_5.5.0.bb new file mode 100644 index 00000000..028690df --- /dev/null +++ b/recipes-kde-framework/tier3/knotifications/knotifications_5.5.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Abstraction for system notifications" +LICENSE = "MIT & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \ +" + +inherit kde cmake-lib + +DEPENDS += "kwindowsystem kservice kconfig kiconthemes kcodecs kcoreaddons phonon" +DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}" + +SRCREV = "09f44e8fff59ffa2cd67f21906980d6a566324f8" + +# cross libs / headers +CMAKE_HIDE_ERROR[1] = "KF5Notifications, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" +CMAKE_HIDE_ERROR[2] = "KF5Notifications, -S${includedir}, -S${STAGING_INCDIR}" + +FILES_${PN} += "${datadir}/dbus-1" diff --git a/recipes-kde-base/krunner/krunner_5.5.0.bb b/recipes-kde-framework/tier3/krunner/krunner_5.5.0.bb similarity index 85% rename from recipes-kde-base/krunner/krunner_5.5.0.bb rename to recipes-kde-framework/tier3/krunner/krunner_5.5.0.bb index f368d309..e5ffa72f 100644 --- a/recipes-kde-base/krunner/krunner_5.5.0.bb +++ b/recipes-kde-framework/tier3/krunner/krunner_5.5.0.bb @@ -9,7 +9,7 @@ inherit kde SRCREV = "174472e8aae63899dbf09c9c07ba249d84d4a4c0" -DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio" +DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice solid" #CMAKE_HIDE_ERROR[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}" diff --git a/recipes-kde-base/kservice/kservice_5.5.0.bb b/recipes-kde-framework/tier3/kservice/kservice_5.5.0.bb similarity index 100% rename from recipes-kde-base/kservice/kservice_5.5.0.bb rename to recipes-kde-framework/tier3/kservice/kservice_5.5.0.bb diff --git a/recipes-kde-base/ktextwidgets/ktextwidgets_5.5.0.bb b/recipes-kde-framework/tier3/ktextwidgets/ktextwidgets_5.5.0.bb similarity index 100% rename from recipes-kde-base/ktextwidgets/ktextwidgets_5.5.0.bb rename to recipes-kde-framework/tier3/ktextwidgets/ktextwidgets_5.5.0.bb diff --git a/recipes-kde-framework/tier3/kwallet/kwallet_5.5.0.bb b/recipes-kde-framework/tier3/kwallet/kwallet_5.5.0.bb new file mode 100644 index 00000000..c46d4c81 --- /dev/null +++ b/recipes-kde-framework/tier3/kwallet/kwallet_5.5.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Secure and unified container for user passwords" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +inherit kde cmake-lib + +DEPENDS += "libgcrypt gpgme kconfig kwindowsystem ki18n" + +SRCREV = "85723c9c84a1a47e4e108de812183ac07656859b" + +#EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" + +# cross libs / headers +CMAKE_HIDE_ERROR[1] = "KF5XmlGui, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" +CMAKE_HIDE_ERROR[2] = "KF5XmlGui, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-kde-base/kxmlgui/kxmlgui_5.5.0.bb b/recipes-kde-framework/tier3/kxmlgui/kxmlgui_5.5.0.bb similarity index 100% rename from recipes-kde-base/kxmlgui/kxmlgui_5.5.0.bb rename to recipes-kde-framework/tier3/kxmlgui/kxmlgui_5.5.0.bb diff --git a/recipes-kde-base/extra-cmake-modules/extra-cmake-modules_1.5.0.bb b/recipes-kde-framework/untier/extra-cmake-modules/extra-cmake-modules_1.5.0.bb similarity index 100% rename from recipes-kde-base/extra-cmake-modules/extra-cmake-modules_1.5.0.bb rename to recipes-kde-framework/untier/extra-cmake-modules/extra-cmake-modules_1.5.0.bb diff --git a/recipes-kde-base/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch b/recipes-kde-framework/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch similarity index 100% rename from recipes-kde-base/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch rename to recipes-kde-framework/untier/kwayland/files/0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch diff --git a/recipes-kde-base/kwayland/files/0002-install-server-library.patch b/recipes-kde-framework/untier/kwayland/files/0002-install-server-library.patch similarity index 100% rename from recipes-kde-base/kwayland/files/0002-install-server-library.patch rename to recipes-kde-framework/untier/kwayland/files/0002-install-server-library.patch diff --git a/recipes-kde-base/kwayland/kwayland_git.bb b/recipes-kde-framework/untier/kwayland/kwayland_git.bb similarity index 100% rename from recipes-kde-base/kwayland/kwayland_git.bb rename to recipes-kde-framework/untier/kwayland/kwayland_git.bb diff --git a/recipes-kde-base/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch b/recipes-kde-framework/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch similarity index 100% rename from recipes-kde-base/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch rename to recipes-kde-framework/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch diff --git a/recipes-kde-base/libkscreen/libkscreen_5.1.1.bb b/recipes-kde-framework/untier/libkscreen/libkscreen_5.1.1.bb similarity index 100% rename from recipes-kde-base/libkscreen/libkscreen_5.1.1.bb rename to recipes-kde-framework/untier/libkscreen/libkscreen_5.1.1.bb diff --git a/recipes-kde-base/phonon/phonon_4.8.bb b/recipes-kde-framework/untier/phonon/phonon_4.8.bb similarity index 100% rename from recipes-kde-base/phonon/phonon_4.8.bb rename to recipes-kde-framework/untier/phonon/phonon_4.8.bb diff --git a/recipes-kde-base/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde-framework/untier/polkit-qt-1/polkit-qt-1_0.112.0.bb similarity index 100% rename from recipes-kde-base/polkit-qt-1/polkit-qt-1_0.112.0.bb rename to recipes-kde-framework/untier/polkit-qt-1/polkit-qt-1_0.112.0.bb