From c941a21cfe81d9e96d9573d6b2c54a34b3884f4c Mon Sep 17 00:00:00 2001 From: Hannah Kiekens Date: Wed, 27 Oct 2021 21:42:00 +0200 Subject: [PATCH] Switch to new bitbake override syntax --- classes/cmake_kf5.bbclass | 14 +++++++------- classes/kcoreaddons.bbclass | 2 +- classes/kdoctools.bbclass | 2 +- classes/reuse_license_checksums.bbclass | 2 +- recipes-kdesupport/phonon.inc | 4 ++-- recipes-kdesupport/plasma-wayland-protocols.inc | 2 +- recipes-kdesupport/polkit-qt-1.inc | 2 +- recipes-kf5/obsolete/kdelibs4support.inc | 12 ++++++------ recipes-kf5/obsolete/kdesignerplugin.inc | 6 +++--- recipes-kf5/obsolete/kjs.inc | 4 ++-- .../packagegroups/packagegroup-kde-frameworks5.bb | 2 +- recipes-kf5/tier1/bluez-qt.inc | 6 +++--- recipes-kf5/tier1/breeze-icons.inc | 4 ++-- recipes-kf5/tier1/extra-cmake-modules.inc | 2 +- recipes-kf5/tier1/kconfig.inc | 6 +++--- recipes-kf5/tier1/kcoreaddons.inc | 4 ++-- recipes-kf5/tier1/kguiaddons.inc | 2 +- recipes-kf5/tier1/kholidays.inc | 2 +- recipes-kf5/tier1/ki18n.inc | 10 +++++----- recipes-kf5/tier1/kidletime.inc | 2 +- recipes-kf5/tier1/kimageformats.inc | 4 ++-- recipes-kf5/tier1/kirigami.inc | 4 ++-- recipes-kf5/tier1/kitemmodels.inc | 2 +- recipes-kf5/tier1/kquickcharts.inc | 2 +- recipes-kf5/tier1/kwidgetsaddons.inc | 2 +- recipes-kf5/tier1/kwindowsystem.inc | 2 +- recipes-kf5/tier1/modemmanager-qt.inc | 2 +- recipes-kf5/tier1/networkmanager-qt.inc | 2 +- recipes-kf5/tier1/oxygen-icons5.inc | 2 +- recipes-kf5/tier1/prison.inc | 2 +- recipes-kf5/tier1/solid.inc | 2 +- recipes-kf5/tier1/sonnet.inc | 6 +++--- recipes-kf5/tier1/syntax-highlighting.inc | 8 ++++---- recipes-kf5/tier2/kactivities.inc | 2 +- recipes-kf5/tier2/kauth.inc | 12 ++++++------ recipes-kf5/tier2/kcontacts.inc | 2 +- recipes-kf5/tier2/kdoctools.inc | 10 +++++----- recipes-kf5/tier2/kfilemetadata.inc | 2 +- recipes-kf5/tier3/baloo.inc | 4 ++-- recipes-kf5/tier3/kconfigwidgets.inc | 4 ++-- recipes-kf5/tier3/kdeclarative.inc | 4 ++-- recipes-kf5/tier3/kded.inc | 2 +- recipes-kf5/tier3/kemoticons.inc | 2 +- recipes-kf5/tier3/kglobalaccel.inc | 2 +- recipes-kf5/tier3/kiconthemes.inc | 2 +- recipes-kf5/tier3/kinit.inc | 2 +- recipes-kf5/tier3/kio.inc | 4 ++-- recipes-kf5/tier3/knewstuff.inc | 2 +- recipes-kf5/tier3/kpeople.inc | 2 +- recipes-kf5/tier3/krunner.inc | 2 +- recipes-kf5/tier3/ktexteditor.inc | 4 ++-- recipes-kf5/tier3/plasma-framework.inc | 2 +- recipes-kf5/tier3/purpose.inc | 2 +- recipes-kf5/tier3/qqc2-desktop-style.inc | 2 +- recipes-kf5/tier4/frameworkintegration.inc | 2 +- 55 files changed, 101 insertions(+), 101 deletions(-) diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass index ad503e2..348c902 100644 --- a/classes/cmake_kf5.bbclass +++ b/classes/cmake_kf5.bbclass @@ -6,13 +6,13 @@ inherit cmake_qt5 -EXTRA_OECMAKE_class-native += " \ +EXTRA_OECMAKE:class-native += " \ -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \ -DBUILD_TESTING=OFF \ -DBUILD_DESIGNERPLUGIN=OFF \ " -EXTRA_OECMAKE_class-target += " \ +EXTRA_OECMAKE:class-target += " \ -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \ -DBUILD_TESTING=OFF \ -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake \ @@ -22,17 +22,17 @@ EXTRA_OECMAKE_class-target += " \ DEPENDS += "extra-cmake-modules qttools-native" # don't bother with translations for host tools -do_configure_prepend_class-native() { +do_configure:prepend:class-native() { rm -rf ${S}/po } -do_compile_prepend() { +do_compile:prepend() { export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH } # This function is rather offensive right now, but it seems to work -do_install_prepend() { +do_install:prepend() { if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then sed -i 's/\"\/usr\//\"\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) sed -i 's/\;\/usr\//\;\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) @@ -41,7 +41,7 @@ do_install_prepend() { BBCLASSEXTEND = "native nativesdk" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/system-services/*.service \ ${datadir}/dbus-1/system.d/*.conf \ @@ -53,7 +53,7 @@ FILES_${PN} += " \ ${datadir}/polkit-1/actions/*.policy \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/dbus-1/interfaces/*.xml \ ${datadir}/kdevappwizard/templates/*.tar.bz2 \ ${datadir}/qlogging-categories5 \ diff --git a/classes/kcoreaddons.bbclass b/classes/kcoreaddons.bbclass index 6e480ac..790cf17 100644 --- a/classes/kcoreaddons.bbclass +++ b/classes/kcoreaddons.bbclass @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: MIT -do_compile_prepend() { +do_compile:prepend() { # desktoptojson needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } diff --git a/classes/kdoctools.bbclass b/classes/kdoctools.bbclass index 319c0d4..4b6006a 100644 --- a/classes/kdoctools.bbclass +++ b/classes/kdoctools.bbclass @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: MIT -do_compile_prepend() { +do_compile:prepend() { # meinproc5 needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } diff --git a/classes/reuse_license_checksums.bbclass b/classes/reuse_license_checksums.bbclass index 4932cbc..a7f7119 100644 --- a/classes/reuse_license_checksums.bbclass +++ b/classes/reuse_license_checksums.bbclass @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: MIT -do_populate_lic_prepend() { +do_populate_lic:prepend() { srcdir = d.getVar('S') # keys are only Yocto's SPDX(-like) identifiers from licenses.conf diff --git a/recipes-kdesupport/phonon.inc b/recipes-kdesupport/phonon.inc index ffa0715..f880b93 100644 --- a/recipes-kdesupport/phonon.inc +++ b/recipes-kdesupport/phonon.inc @@ -16,12 +16,12 @@ inherit cmake_qt5 EXTRA_OECMAKE += " -DPHONON_BUILD_PHONON4QT5=ON" # remove the widget designer plugin, this makes no sense for the target -do_install_append() { +do_install:append() { rm -rf ${D}/${libdir}/qt5/ rm -rf ${D}/${libdir}/plugins/ } -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/phonon4qt5/buildsystem/* \ ${datadir}/dbus-1/interfaces/*.xml \ ${datadir}/qt5/mkspecs/modules/*.pri \ diff --git a/recipes-kdesupport/plasma-wayland-protocols.inc b/recipes-kdesupport/plasma-wayland-protocols.inc index a82f62d..b9986f0 100644 --- a/recipes-kdesupport/plasma-wayland-protocols.inc +++ b/recipes-kdesupport/plasma-wayland-protocols.inc @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" inherit cmake_qt5 -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/cmake/* \ ${datadir}/plasma-wayland-protocols/* \ " diff --git a/recipes-kdesupport/polkit-qt-1.inc b/recipes-kdesupport/polkit-qt-1.inc index 044cab4..5b7ccde 100644 --- a/recipes-kdesupport/polkit-qt-1.inc +++ b/recipes-kdesupport/polkit-qt-1.inc @@ -14,6 +14,6 @@ S = "${WORKDIR}/git" inherit cmake_kf5 -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/cmake/PolkitQt5-1/* \ " diff --git a/recipes-kf5/obsolete/kdelibs4support.inc b/recipes-kf5/obsolete/kdelibs4support.inc index 6b6c07e..b0d987b 100644 --- a/recipes-kf5/obsolete/kdelibs4support.inc +++ b/recipes-kf5/obsolete/kdelibs4support.inc @@ -30,7 +30,7 @@ DEPENDS = " \ openssl \ " -EXTRA_OECMAKE_class-target += " -DHAVE_GOOD_GETADDRINFO=ON" +EXTRA_OECMAKE:class-target += " -DHAVE_GOOD_GETADDRINFO=ON" require kdelibs4support_metainfo.inc inherit cmake_kf5 @@ -38,16 +38,16 @@ inherit ki18n inherit perlnative inherit kdoctools -do_compile_prepend() { +do_compile:prepend() { # desktoptojson needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } -do_install_append_class-target() { +do_install:append:class-target() { rm -rf ${D}${libdir}/plugins/designer } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/*.so \ ${libdir}/plugins/kf5/kio/*.so \ ${libdir}/plugins/kf5/kded/*.so \ @@ -61,8 +61,8 @@ FILES_${PN} += " \ ${datadir}/kf5/kdoctools/customization/dtd/kdex.dtd \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/kf5/widgets/pics/*.png \ " -RDEPENDS_kdelibs4support += "perl" +RDEPENDS:kdelibs4support += "perl" diff --git a/recipes-kf5/obsolete/kdesignerplugin.inc b/recipes-kf5/obsolete/kdesignerplugin.inc index b1a78c3..107acf7 100644 --- a/recipes-kf5/obsolete/kdesignerplugin.inc +++ b/recipes-kf5/obsolete/kdesignerplugin.inc @@ -16,15 +16,15 @@ DEPENDS = " \ require kdesignerplugin_metainfo.inc inherit cmake_kf5 -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/kf5/widgets/pics/*.png \ " -sysroot_stage_all_append_class-target () { +sysroot_stage_all:append:class-target () { mkdir -p ${SYSROOT_DESTDIR}${bindir} cp ${STAGING_BINDIR_NATIVE}/kgendesignerplugin ${SYSROOT_DESTDIR}/${bindir} } -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${bindir}/kgendesignerplugin \ " diff --git a/recipes-kf5/obsolete/kjs.inc b/recipes-kf5/obsolete/kjs.inc index b01ac17..8409ffa 100644 --- a/recipes-kf5/obsolete/kjs.inc +++ b/recipes-kf5/obsolete/kjs.inc @@ -13,11 +13,11 @@ require kjs_metainfo.inc inherit cmake_kf5 inherit perlnative -sysroot_stage_all_append_class-native () { +sysroot_stage_all:append:class-native () { mkdir -p ${SYSROOT_DESTDIR}/${bindir} cp ${B}/bin/icemaker ${SYSROOT_DESTDIR}/${bindir} } -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/kf5/kjs/create_hash_table \ " diff --git a/recipes-kf5/packagegroups/packagegroup-kde-frameworks5.bb b/recipes-kf5/packagegroups/packagegroup-kde-frameworks5.bb index 813eeb8..91ddf57 100644 --- a/recipes-kf5/packagegroups/packagegroup-kde-frameworks5.bb +++ b/recipes-kf5/packagegroups/packagegroup-kde-frameworks5.bb @@ -14,7 +14,7 @@ inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "wayland x11" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ attica \ bluez-qt \ breeze-icons \ diff --git a/recipes-kf5/tier1/bluez-qt.inc b/recipes-kf5/tier1/bluez-qt.inc index d23b66e..6df70b3 100644 --- a/recipes-kf5/tier1/bluez-qt.inc +++ b/recipes-kf5/tier1/bluez-qt.inc @@ -13,12 +13,12 @@ require bluez-qt_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -EXTRA_OECMAKE_class-target += " \ +EXTRA_OECMAKE:class-target += " \ -DUDEV_RULES_INSTALL_DIR=${libdir}/udev/rules.d \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/bluezqt/* \ " -RDEPENDS_${PN} += "bluez5" +RDEPENDS:${PN} += "bluez5" diff --git a/recipes-kf5/tier1/breeze-icons.inc b/recipes-kf5/tier1/breeze-icons.inc index 4fbbe1c..6c9428b 100644 --- a/recipes-kf5/tier1/breeze-icons.inc +++ b/recipes-kf5/tier1/breeze-icons.inc @@ -10,9 +10,9 @@ require breeze-icons_metainfo.inc inherit cmake_kf5 # bash is in the hosttools folder in PATH, but that's not detected automatically # due to the CMAKE_FIND_ROOT_PATH settings -EXTRA_OECMAKE_class-target += " -DBASH_EXE=`which bash`" +EXTRA_OECMAKE:class-target += " -DBASH_EXE=`which bash`" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/icons/breeze \ ${datadir}/icons/breeze-dark \ " diff --git a/recipes-kf5/tier1/extra-cmake-modules.inc b/recipes-kf5/tier1/extra-cmake-modules.inc index 2e1d539..b4cc980 100644 --- a/recipes-kf5/tier1/extra-cmake-modules.inc +++ b/recipes-kf5/tier1/extra-cmake-modules.inc @@ -14,6 +14,6 @@ inherit reuse_license_checksums CLEANBROKEN = "1" -FILES_${PN}-dev += " ${datadir}/ECM" +FILES:${PN}-dev += " ${datadir}/ECM" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-kf5/tier1/kconfig.inc b/recipes-kf5/tier1/kconfig.inc index 0f4cb8e..bd18078 100644 --- a/recipes-kf5/tier1/kconfig.inc +++ b/recipes-kf5/tier1/kconfig.inc @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # # requires session management support in QtGui -# eg. via PACKAGECONFIG_append_pn-qtbase = "sm" in local.conf +# eg. via PACKAGECONFIG:append:pn-qtbase = "sm" in local.conf LICENSE = "MIT & BSD-2-Clause & BSD-3-Clause & LGPL-2.0+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)" PR = "r0" @@ -14,8 +14,8 @@ DEPENDS = "qtbase kconfig-native" require kconfig_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -EXTRA_OECMAKE_class-native += " -DKCONFIG_USE_GUI=OFF" +EXTRA_OECMAKE:class-native += " -DKCONFIG_USE_GUI=OFF" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libexecdir}/kf5/kconfig_compiler_kf5 \ " diff --git a/recipes-kf5/tier1/kcoreaddons.inc b/recipes-kf5/tier1/kcoreaddons.inc index 53fbd89..891acb0 100644 --- a/recipes-kf5/tier1/kcoreaddons.inc +++ b/recipes-kf5/tier1/kcoreaddons.inc @@ -16,11 +16,11 @@ inherit cmake_kf5 inherit reuse_license_checksums inherit mime-xdg -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/mime/packages/kde5.xml \ ${datadir}/kf5/licenses/* \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${bindir}/desktoptojson \ " diff --git a/recipes-kf5/tier1/kguiaddons.inc b/recipes-kf5/tier1/kguiaddons.inc index 0c714ab..7d90fad 100644 --- a/recipes-kf5/tier1/kguiaddons.inc +++ b/recipes-kf5/tier1/kguiaddons.inc @@ -22,6 +22,6 @@ require kguiaddons_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/kguiaddons/kmodifierkey/ \ " diff --git a/recipes-kf5/tier1/kholidays.inc b/recipes-kf5/tier1/kholidays.inc index bdb38f0..ca26f2e 100644 --- a/recipes-kf5/tier1/kholidays.inc +++ b/recipes-kf5/tier1/kholidays.inc @@ -12,7 +12,7 @@ require kholidays_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/kholidays \ ${datadir}/kf5/libkholidays \ " diff --git a/recipes-kf5/tier1/ki18n.inc b/recipes-kf5/tier1/ki18n.inc index beceb84..2473de4 100644 --- a/recipes-kf5/tier1/ki18n.inc +++ b/recipes-kf5/tier1/ki18n.inc @@ -8,12 +8,12 @@ LICENSE = "LGPL-2.0+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL) & BSD-3-Clause" PR = "r0" -DEPENDS_class-native += " \ +DEPENDS:class-native += " \ qtbase \ gettext-native \ extra-cmake-modules-native \ " -DEPENDS_class-target += " \ +DEPENDS:class-target += " \ qtdeclarative \ gettext-native \ extra-cmake-modules \ @@ -24,12 +24,12 @@ inherit cmake_kf5 inherit python3native inherit reuse_license_checksums -EXTRA_OECMAKE_class-native += " -DBUILD_WITH_QTSCRIPT=OFF -DLibIntl_SEARCH_PATH=/usr/include" +EXTRA_OECMAKE:class-native += " -DBUILD_WITH_QTSCRIPT=OFF -DLibIntl_SEARCH_PATH=/usr/include" -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/plugins/kf5/.debug/ktranscript.so \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/ktranscript.so \ " diff --git a/recipes-kf5/tier1/kidletime.inc b/recipes-kf5/tier1/kidletime.inc index d132ce5..145767c 100644 --- a/recipes-kf5/tier1/kidletime.inc +++ b/recipes-kf5/tier1/kidletime.inc @@ -17,6 +17,6 @@ require kidletime_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/org.kde.kidletime.platforms/*.so \ " diff --git a/recipes-kf5/tier1/kimageformats.inc b/recipes-kf5/tier1/kimageformats.inc index 24c86a6..8d1cf2c 100644 --- a/recipes-kf5/tier1/kimageformats.inc +++ b/recipes-kf5/tier1/kimageformats.inc @@ -14,11 +14,11 @@ require kimageformats_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/plugins/imageformats/.debug/*.so \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/imageformats/*.so \ ${datadir}/kservices5/qimageioplugins/*.desktop \ " diff --git a/recipes-kf5/tier1/kirigami.inc b/recipes-kf5/tier1/kirigami.inc index 384edc8..4b49d8d 100644 --- a/recipes-kf5/tier1/kirigami.inc +++ b/recipes-kf5/tier1/kirigami.inc @@ -15,11 +15,11 @@ require kirigami_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/kirigami.2 \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtgraphicaleffects-qmlplugins \ qtquickcontrols2-qmlplugins \ " diff --git a/recipes-kf5/tier1/kitemmodels.inc b/recipes-kf5/tier1/kitemmodels.inc index 7fb8e38..399fefa 100644 --- a/recipes-kf5/tier1/kitemmodels.inc +++ b/recipes-kf5/tier1/kitemmodels.inc @@ -14,7 +14,7 @@ require kitemmodels_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/kitemmodels/qmldir \ ${libdir}/qml/org/kde/kitemmodels/libitemmodelsplugin.so \ " diff --git a/recipes-kf5/tier1/kquickcharts.inc b/recipes-kf5/tier1/kquickcharts.inc index 7c9bbdd..ca9b1ec 100644 --- a/recipes-kf5/tier1/kquickcharts.inc +++ b/recipes-kf5/tier1/kquickcharts.inc @@ -15,6 +15,6 @@ require kquickcharts_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/quickcharts \ " diff --git a/recipes-kf5/tier1/kwidgetsaddons.inc b/recipes-kf5/tier1/kwidgetsaddons.inc index d4c6724..9ec6870 100644 --- a/recipes-kf5/tier1/kwidgetsaddons.inc +++ b/recipes-kf5/tier1/kwidgetsaddons.inc @@ -14,6 +14,6 @@ require kwidgetsaddons_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/kf5/kcharselect/kcharselect-data \ " diff --git a/recipes-kf5/tier1/kwindowsystem.inc b/recipes-kf5/tier1/kwindowsystem.inc index f2cd566..52cfb25 100644 --- a/recipes-kf5/tier1/kwindowsystem.inc +++ b/recipes-kf5/tier1/kwindowsystem.inc @@ -17,7 +17,7 @@ require kwindowsystem_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/org.kde.kwindowsystem.platforms/* \ ${libdir}/plugins/kf5/kwindowsystem/* \ " diff --git a/recipes-kf5/tier1/modemmanager-qt.inc b/recipes-kf5/tier1/modemmanager-qt.inc index 4114160..801d882 100644 --- a/recipes-kf5/tier1/modemmanager-qt.inc +++ b/recipes-kf5/tier1/modemmanager-qt.inc @@ -12,4 +12,4 @@ require modemmanager-qt_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -RDEPENDS_${PN} += "modemmanager" +RDEPENDS:${PN} += "modemmanager" diff --git a/recipes-kf5/tier1/networkmanager-qt.inc b/recipes-kf5/tier1/networkmanager-qt.inc index 1a3903a..a9ac307 100644 --- a/recipes-kf5/tier1/networkmanager-qt.inc +++ b/recipes-kf5/tier1/networkmanager-qt.inc @@ -12,4 +12,4 @@ require networkmanager-qt_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -RDEPENDS_${PN} += "networkmanager" +RDEPENDS:${PN} += "networkmanager" diff --git a/recipes-kf5/tier1/oxygen-icons5.inc b/recipes-kf5/tier1/oxygen-icons5.inc index 0608513..3191c47 100644 --- a/recipes-kf5/tier1/oxygen-icons5.inc +++ b/recipes-kf5/tier1/oxygen-icons5.inc @@ -9,7 +9,7 @@ PR = "r0" require oxygen-icons5_metainfo.inc inherit cmake_kf5 -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/icons/oxygen/index.theme \ ${datadir}/icons/oxygen/base/*/*/*.png \ " diff --git a/recipes-kf5/tier1/prison.inc b/recipes-kf5/tier1/prison.inc index c68a4d3..68a795f 100644 --- a/recipes-kf5/tier1/prison.inc +++ b/recipes-kf5/tier1/prison.inc @@ -13,6 +13,6 @@ require prison_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/prison/ \ " diff --git a/recipes-kf5/tier1/solid.inc b/recipes-kf5/tier1/solid.inc index a14354b..6452402 100644 --- a/recipes-kf5/tier1/solid.inc +++ b/recipes-kf5/tier1/solid.inc @@ -15,7 +15,7 @@ require solid_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/solid/qmldir \ ${libdir}/qml/org/kde/solid/*.so \ " diff --git a/recipes-kf5/tier1/sonnet.inc b/recipes-kf5/tier1/sonnet.inc index a61be0c..f6ba7b7 100644 --- a/recipes-kf5/tier1/sonnet.inc +++ b/recipes-kf5/tier1/sonnet.inc @@ -12,9 +12,9 @@ require sonnet_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -EXTRA_OECMAKE_append_class-native += " -DSONNET_USE_WIDGETS=OFF" -EXTRA_OECMAKE_append_class-target += " -DPARSETRIGRAMS_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/parsetrigrams" +EXTRA_OECMAKE:append:class-native += " -DSONNET_USE_WIDGETS=OFF" +EXTRA_OECMAKE:append:class-target += " -DPARSETRIGRAMS_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/parsetrigrams" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/kf5/sonnet/* \ " diff --git a/recipes-kf5/tier1/syntax-highlighting.inc b/recipes-kf5/tier1/syntax-highlighting.inc index f750822..282785b 100644 --- a/recipes-kf5/tier1/syntax-highlighting.inc +++ b/recipes-kf5/tier1/syntax-highlighting.inc @@ -19,14 +19,14 @@ inherit cmake_kf5 inherit perlnative inherit reuse_license_checksums -EXTRA_OECMAKE_class-native += " -DKSYNTAXHIGHLIGHTING_USE_GUI=OFF" -EXTRA_OECMAKE_class-target += " -DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/katehighlightingindexer" +EXTRA_OECMAKE:class-native += " -DKSYNTAXHIGHLIGHTING_USE_GUI=OFF" +EXTRA_OECMAKE:class-target += " -DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/katehighlightingindexer" -sysroot_stage_all_append_class-native () { +sysroot_stage_all:append:class-native () { mkdir -p ${SYSROOT_DESTDIR}/${bindir} cp ${B}/bin/katehighlightingindexer ${SYSROOT_DESTDIR}/${bindir} } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/syntaxhighlighting/ \ " diff --git a/recipes-kf5/tier2/kactivities.inc b/recipes-kf5/tier2/kactivities.inc index b67685d..398072f 100644 --- a/recipes-kf5/tier2/kactivities.inc +++ b/recipes-kf5/tier2/kactivities.inc @@ -21,6 +21,6 @@ require kactivities_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/activities/* \ " diff --git a/recipes-kf5/tier2/kauth.inc b/recipes-kf5/tier2/kauth.inc index e4655ac..0bc25e0 100644 --- a/recipes-kf5/tier2/kauth.inc +++ b/recipes-kf5/tier2/kauth.inc @@ -7,29 +7,29 @@ LICENSE = "LGPL-2.1 & LGPL-2.0+ & BSD-3-Clause" PR = "r0" -DEPENDS_class-native = "extra-cmake-modules qtbase-native kcoreaddons-native" -DEPENDS_class-target = "qtbase kcoreaddons kauth-native polkit-qt-1" +DEPENDS:class-native = "extra-cmake-modules qtbase-native kcoreaddons-native" +DEPENDS:class-target = "qtbase kcoreaddons kauth-native polkit-qt-1" require kauth_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -EXTRA_OECMAKE_class-target += " \ +EXTRA_OECMAKE:class-target += " \ -DKAUTH_BACKEND_NAME=POLKITQT5-1 \ " -EXTRA_OECMAKE_class-native += " \ +EXTRA_OECMAKE:class-native += " \ -DKAUTH_BACKEND_NAME=POLKITQT5-1 \ -DKAUTH_BUILD_CODEGENERATOR_ONLY=ON \ -DKAUTH_POLICY_FILES_INSTALL_DIR=${datadir}/polkit-1/actions \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kauth/helper/kauth_helper_plugin.so \ ${libdir}/plugins/kauth/backend/kauth_backend_plugin.so \ ${datadir}/kf5/kauth/*.stub \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libexecdir}/kauth/kauth-policy-gen \ " diff --git a/recipes-kf5/tier2/kcontacts.inc b/recipes-kf5/tier2/kcontacts.inc index 187a12e..37ba804 100644 --- a/recipes-kf5/tier2/kcontacts.inc +++ b/recipes-kf5/tier2/kcontacts.inc @@ -16,7 +16,7 @@ DEPENDS = " \ kcodecs \ " -RDEPENDS_${PN} += "iso-codes" +RDEPENDS:${PN} += "iso-codes" require kcontacts_metainfo.inc inherit cmake_kf5 diff --git a/recipes-kf5/tier2/kdoctools.inc b/recipes-kf5/tier2/kdoctools.inc index cf834ad..8b9f4d6 100644 --- a/recipes-kf5/tier2/kdoctools.inc +++ b/recipes-kf5/tier2/kdoctools.inc @@ -25,27 +25,27 @@ inherit python3native inherit perlnative inherit reuse_license_checksums -EXTRA_OECMAKE_class-native += " -DINSTALL_INTERNAL_TOOLS=ON" +EXTRA_OECMAKE:class-native += " -DINSTALL_INTERNAL_TOOLS=ON" -EXTRA_OECMAKE_class-target += " \ +EXTRA_OECMAKE:class-target += " \ -DMEINPROC5_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/meinproc5 \ -DDOCBOOKL10NHELPER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/docbookl10nhelper \ -DCHECKXML5_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/checkXML5 \ " -sysroot_stage_all_append_class-native () { +sysroot_stage_all:append:class-native () { mkdir -p ${SYSROOT_DESTDIR}${bindir} cp ${B}/bin/docbookl10nhelper ${SYSROOT_DESTDIR}${bindir} } -sysroot_stage_all_append_class-target () { +sysroot_stage_all:append:class-target () { mkdir -p ${SYSROOT_DESTDIR}${bindir} cp ${STAGING_BINDIR_NATIVE}/checkXML5 ${SYSROOT_DESTDIR}${bindir} cp ${STAGING_BINDIR_NATIVE}/meinproc5 ${SYSROOT_DESTDIR}${bindir} } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/kf5/kdoctools/customization/* \ ${datadir}/kf5/kdoctools/customization/*/* \ ${datadir}/kf5/kdoctools/customization/*/*/* \ diff --git a/recipes-kf5/tier2/kfilemetadata.inc b/recipes-kf5/tier2/kfilemetadata.inc index 61b0a67..c1d32b2 100644 --- a/recipes-kf5/tier2/kfilemetadata.inc +++ b/recipes-kf5/tier2/kfilemetadata.inc @@ -22,6 +22,6 @@ inherit reuse_license_checksums REQUIRED_DISTRO_FEATURES += "xattr" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/kfilemetadata/*.so \ " diff --git a/recipes-kf5/tier3/baloo.inc b/recipes-kf5/tier3/baloo.inc index 6978007..01ae302 100644 --- a/recipes-kf5/tier3/baloo.inc +++ b/recipes-kf5/tier3/baloo.inc @@ -30,7 +30,7 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/kio/*.so \ ${libdir}/plugins/kf5/kded/*.so \ ${libdir}/systemd/user/* \ @@ -42,4 +42,4 @@ PRIVATE_LIBS += " \ liblmdb.so.* \ " -RDEPENDS_${PN} += "lmdb" +RDEPENDS:${PN} += "lmdb" diff --git a/recipes-kf5/tier3/kconfigwidgets.inc b/recipes-kf5/tier3/kconfigwidgets.inc index 14c1ba2..7fb804a 100644 --- a/recipes-kf5/tier3/kconfigwidgets.inc +++ b/recipes-kf5/tier3/kconfigwidgets.inc @@ -24,8 +24,8 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${bindir}/preparetips5 \ " -RDEPENDS_${PN}-dev += "perl" +RDEPENDS:${PN}-dev += "perl" diff --git a/recipes-kf5/tier3/kdeclarative.inc b/recipes-kf5/tier3/kdeclarative.inc index 1ef4839..07ab339 100644 --- a/recipes-kf5/tier3/kdeclarative.inc +++ b/recipes-kf5/tier3/kdeclarative.inc @@ -31,10 +31,10 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtdeclarative-qmlplugins \ " diff --git a/recipes-kf5/tier3/kded.inc b/recipes-kf5/tier3/kded.inc index 2cacd16..6057e8b 100644 --- a/recipes-kf5/tier3/kded.inc +++ b/recipes-kf5/tier3/kded.inc @@ -26,7 +26,7 @@ inherit kdoctools inherit reuse_license_checksums FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/libkdeinit5_kded5.so \ ${libdir}/systemd/user/plasma-kded.service \ " diff --git a/recipes-kf5/tier3/kemoticons.inc b/recipes-kf5/tier3/kemoticons.inc index 4647376..05d8ee7 100644 --- a/recipes-kf5/tier3/kemoticons.inc +++ b/recipes-kf5/tier3/kemoticons.inc @@ -20,7 +20,7 @@ require kemoticons_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/*.so \ ${libdir}/plugins/kf5/emoticonsthemes/*.so \ ${datadir}/emoticons/Konqi/*.png \ diff --git a/recipes-kf5/tier3/kglobalaccel.inc b/recipes-kf5/tier3/kglobalaccel.inc index 1456452..d3f5b16 100644 --- a/recipes-kf5/tier3/kglobalaccel.inc +++ b/recipes-kf5/tier3/kglobalaccel.inc @@ -21,7 +21,7 @@ require kglobalaccel_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/org.kde.kglobalaccel5.platforms/*.so \ ${libdir}/systemd \ " diff --git a/recipes-kf5/tier3/kiconthemes.inc b/recipes-kf5/tier3/kiconthemes.inc index a066ed0..b5333b4 100644 --- a/recipes-kf5/tier3/kiconthemes.inc +++ b/recipes-kf5/tier3/kiconthemes.inc @@ -24,6 +24,6 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/plugins/iconengines/ \ " diff --git a/recipes-kf5/tier3/kinit.inc b/recipes-kf5/tier3/kinit.inc index 5f8cd37..04d88dc 100644 --- a/recipes-kf5/tier3/kinit.inc +++ b/recipes-kf5/tier3/kinit.inc @@ -26,6 +26,6 @@ inherit kdoctools inherit reuse_license_checksums FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/libkdeinit5_klauncher.so \ " diff --git a/recipes-kf5/tier3/kio.inc b/recipes-kf5/tier3/kio.inc index 17dcacf..4950721 100644 --- a/recipes-kf5/tier3/kio.inc +++ b/recipes-kf5/tier3/kio.inc @@ -34,7 +34,7 @@ inherit kauth inherit mime-xdg inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kcm_*.so \ ${libdir}/plugins/kf5/kio/*.so \ ${libdir}/plugins/kf5/kded/*.so \ @@ -46,6 +46,6 @@ FILES_${PN} += " \ ${datadir}/kconf_update \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ca-certificates \ " diff --git a/recipes-kf5/tier3/knewstuff.inc b/recipes-kf5/tier3/knewstuff.inc index c47aae5..c410b4d 100644 --- a/recipes-kf5/tier3/knewstuff.inc +++ b/recipes-kf5/tier3/knewstuff.inc @@ -37,7 +37,7 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/newstuff/* \ ${libdir}/qml/org/kde/newstuff/qml/* \ ${datadir}/kf5/knewstuff/pics/*.png \ diff --git a/recipes-kf5/tier3/kpeople.inc b/recipes-kf5/tier3/kpeople.inc index b59b855..c5ee1e8 100644 --- a/recipes-kf5/tier3/kpeople.inc +++ b/recipes-kf5/tier3/kpeople.inc @@ -23,7 +23,7 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/people/* \ ${datadir}/kf5/kpeople/*.png \ " diff --git a/recipes-kf5/tier3/krunner.inc b/recipes-kf5/tier3/krunner.inc index a431bcb..404ed71 100644 --- a/recipes-kf5/tier3/krunner.inc +++ b/recipes-kf5/tier3/krunner.inc @@ -29,6 +29,6 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/runnermodel/* \ " diff --git a/recipes-kf5/tier3/ktexteditor.inc b/recipes-kf5/tier3/ktexteditor.inc index 220607e..2f14c04 100644 --- a/recipes-kf5/tier3/ktexteditor.inc +++ b/recipes-kf5/tier3/ktexteditor.inc @@ -28,12 +28,12 @@ inherit cmake_kf5 inherit ki18n inherit reuse_license_checksums -do_compile_prepend() { +do_compile:prepend() { # desktoptojson needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/parts/katepart.so \ ${datadir}/katepart5/script/README.md \ " diff --git a/recipes-kf5/tier3/plasma-framework.inc b/recipes-kf5/tier3/plasma-framework.inc index d14ee4b..32db95a 100644 --- a/recipes-kf5/tier3/plasma-framework.inc +++ b/recipes-kf5/tier3/plasma-framework.inc @@ -39,7 +39,7 @@ inherit ki18n inherit kdoctools inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/*.so \ ${libdir}/plugins/kf5/kirigami/KirigamiPlasmaStyle.so \ ${libdir}/plugins/kpackage/packagestructure/*.so \ diff --git a/recipes-kf5/tier3/purpose.inc b/recipes-kf5/tier3/purpose.inc index b2513d4..c2996b1 100644 --- a/recipes-kf5/tier3/purpose.inc +++ b/recipes-kf5/tier3/purpose.inc @@ -27,7 +27,7 @@ inherit python3native inherit kdoctools inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/kfileitemaction \ ${libdir}/plugins/kf5/purpose \ ${libdir}/qml/org/kde/purpose \ diff --git a/recipes-kf5/tier3/qqc2-desktop-style.inc b/recipes-kf5/tier3/qqc2-desktop-style.inc index f9eced6..815bdb9 100644 --- a/recipes-kf5/tier3/qqc2-desktop-style.inc +++ b/recipes-kf5/tier3/qqc2-desktop-style.inc @@ -21,7 +21,7 @@ require qqc2-desktop-style_metainfo.inc inherit cmake_kf5 inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/kirigami/*.so \ ${libdir}/qml/org/kde/qqc2desktopstyle/private/* \ ${libdir}/qml/QtQuick/Controls.2/org.kde.desktop/* \ diff --git a/recipes-kf5/tier4/frameworkintegration.inc b/recipes-kf5/tier4/frameworkintegration.inc index b3cf089..a920c47 100644 --- a/recipes-kf5/tier4/frameworkintegration.inc +++ b/recipes-kf5/tier4/frameworkintegration.inc @@ -27,7 +27,7 @@ inherit ki18n inherit kdoctools inherit reuse_license_checksums -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/FrameworkIntegrationPlugin.so \ ${datadir}/kf5/infopage \ "