From 72784edf16b26ba12e71a4328c5790e38638593c Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Wed, 29 Dec 2021 11:54:08 +0100 Subject: [PATCH] Convert override syntax to new version For details see: https://docs.yoctoproject.org/next/migration-guides/migration-3.4.html Note that due to this change the latest point release of Dunfell is the minimal requirement to be compatible with this layer. --- classes/cmake_kdeapp.bbclass | 4 ++-- classes/cmake_plasma.bbclass | 4 ++-- recipes-application/education/kanagram.inc | 2 +- recipes-application/education/kdeedu-data.inc | 2 +- recipes-application/education/khangman.inc | 2 +- recipes-application/education/marble.inc | 12 ++++++------ recipes-application/graphics/gwenview.inc | 2 +- recipes-application/graphics/okular.inc | 10 +++++----- recipes-application/network/kdeconnect-kde.inc | 4 ++-- recipes-application/utilities/konsole.inc | 2 +- recipes-extragear/edu/gcompris.inc | 4 ++-- .../packagegroups/packagegroup-kde-applications.bb | 2 +- .../packagegroup-plasma-mobile-applications.bb | 2 +- .../packagegroup-plasma-mobile-workspace.bb | 2 +- .../packagegroups/packagegroup-plasma-mobile.bb | 2 +- .../dunfell-support/modemmanager_1.14.6.bb | 10 +++++----- .../dunfell-support/wayland-protocols_1.21.bb | 2 +- recipes-plasma-mobile/kasts.inc | 2 +- recipes-plasma-mobile/kclock.inc | 4 ++-- recipes-plasma-mobile/koko.inc | 2 +- recipes-plasma-mobile/ktrip.inc | 2 +- recipes-plasma-mobile/kweather.inc | 4 ++-- recipes-plasma-mobile/plasma-settings.inc | 2 +- recipes-plasma/bluedevil.inc | 2 +- recipes-plasma/breeze.inc | 4 ++-- recipes-plasma/discover.inc | 2 +- recipes-plasma/kactivitymanagerd.inc | 4 ++-- recipes-plasma/kdecoration.inc | 2 +- recipes-plasma/kscreen.inc | 2 +- recipes-plasma/kscreenlocker.inc | 4 ++-- recipes-plasma/kwayland-integration.inc | 2 +- recipes-plasma/kwin.inc | 6 +++--- recipes-plasma/libksysguard.inc | 2 +- recipes-plasma/milou.inc | 2 +- recipes-plasma/plasma-integration.inc | 2 +- recipes-plasma/plasma-nano.inc | 4 ++-- recipes-plasma/plasma-nm.inc | 2 +- recipes-plasma/plasma-pa.inc | 4 ++-- recipes-plasma/plasma-phone-components.inc | 4 ++-- recipes-plasma/plasma-systemmonitor.inc | 2 +- recipes-plasma/plasma-workspace.inc | 6 +++--- recipes-plasma/systemsettings.inc | 4 ++-- recipes-plasma/xdg-desktop-portal-kde.inc | 2 +- recipes-playground/arkade.inc | 4 ++-- recipes-playground/kjournald.inc | 6 +++--- recipes-playground/plasma-camera.inc | 2 +- recipes-support/libchewing.inc | 4 ++-- recipes-support/libpinyin.inc | 6 +++--- recipes-support/libreoffice-dictionaries_6.4.5.2.bb | 2 +- recipes-support/maliit-framework-qt5.inc | 4 ++-- recipes-support/maliit-keyboard-qt5.inc | 2 +- recipes-support/qca.inc | 4 ++-- recipes-support/qtkeychain.inc | 4 ++-- recipes-support/sddm/sddm.inc | 10 +++++----- recipes-support/simplelogin.inc | 2 +- recipes-support/telepathy-qt.inc | 2 +- recipes-support/ttf-noto-cjk_2019.03.30.bb | 2 +- recipes-support/ttf-noto_2019.01.11.bb | 2 +- 58 files changed, 101 insertions(+), 101 deletions(-) diff --git a/classes/cmake_kdeapp.bbclass b/classes/cmake_kdeapp.bbclass index 579d49d..147e936 100644 --- a/classes/cmake_kdeapp.bbclass +++ b/classes/cmake_kdeapp.bbclass @@ -22,7 +22,7 @@ do_configure_prepend() { export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/libkdeinit5_*.so \ ${libdir}/kconf_update_bin/* \ ${libdir}/plugins/*.so \ @@ -46,7 +46,7 @@ FILES_${PN} += " \ ${datadir}/qlogging-categories5 \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/dbus-1/interfaces/*.xml \ ${datadir}/kdevappwizard/templates/*.tar.bz2 \ ${libdir}/cmake/*/*.cmake \ diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass index 74b8d0d..41918b1 100644 --- a/classes/cmake_plasma.bbclass +++ b/classes/cmake_plasma.bbclass @@ -25,7 +25,7 @@ do_configure_prepend() { export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/libkdeinit5_*.so \ ${libdir}/kconf_update_bin/* \ ${libdir}/plugins/*.so \ @@ -48,7 +48,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/recipes-application/education/kanagram.inc b/recipes-application/education/kanagram.inc index 3594b72..58e57d7 100644 --- a/recipes-application/education/kanagram.inc +++ b/recipes-application/education/kanagram.inc @@ -26,6 +26,6 @@ inherit kconfig inherit kauth inherit mime-xdg -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ kdeedu-data \ " diff --git a/recipes-application/education/kdeedu-data.inc b/recipes-application/education/kdeedu-data.inc index 367c39f..253fa28 100644 --- a/recipes-application/education/kdeedu-data.inc +++ b/recipes-application/education/kdeedu-data.inc @@ -11,6 +11,6 @@ PR = "r0" inherit cmake_kdeapp -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/apps/kvtml/* \ " diff --git a/recipes-application/education/khangman.inc b/recipes-application/education/khangman.inc index c6f338f..a4ff174 100644 --- a/recipes-application/education/khangman.inc +++ b/recipes-application/education/khangman.inc @@ -28,6 +28,6 @@ inherit kconfig inherit kauth inherit mime-xdg -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ kdeedu-data \ " diff --git a/recipes-application/education/marble.inc b/recipes-application/education/marble.inc index 3e719fd..96d3920 100644 --- a/recipes-application/education/marble.inc +++ b/recipes-application/education/marble.inc @@ -38,12 +38,12 @@ PACKAGES += " \ " FILES_SOLIBSDEV = "" -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/marble-maps \ ${datadir}/applications/org.kde.marble-maps.desktop \ " -FILES_${PN}-shared = " \ +FILES:${PN}-shared = " \ ${datadir}/knsrcfiles \ ${libdir}/libmarbledeclarative.so \ ${libdir} \ @@ -52,7 +52,7 @@ FILES_${PN}-shared = " \ ${datadir} \ " -FILES_${PN}-desktop = " \ +FILES:${PN}-desktop = " \ ${bindir}/marble \ ${bindir}/marble-qt \ ${datadir}/applications/org.kde.marble.desktop \ @@ -60,16 +60,16 @@ FILES_${PN}-desktop = " \ ${datdair}/kxmlgui5 \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/knsrcfiles \ ${libdir}/libastro.so \ ${libdir}/libmarblewidget-qt5.so \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PN}-shared \ " -RDEPENDS_${PN}-desktop += " \ +RDEPENDS:${PN}-desktop += " \ ${PN}-shared \ " diff --git a/recipes-application/graphics/gwenview.inc b/recipes-application/graphics/gwenview.inc index 932e23b..02e7cf3 100644 --- a/recipes-application/graphics/gwenview.inc +++ b/recipes-application/graphics/gwenview.inc @@ -35,6 +35,6 @@ inherit mime-xdg EXTRA_OECMAKE += "-DJPEGLIB_RUN_RESULT=true" EXTRA_OECMAKE += "-DJPEGLIB_RUN_RESULT__TRYRUN_OUTPUT=0" -FILES_${PN} += " \ +FILES:${PN} += " \ /usr/share/solid/actions \ " diff --git a/recipes-application/graphics/okular.inc b/recipes-application/graphics/okular.inc index 6186b81..0481f41 100644 --- a/recipes-application/graphics/okular.inc +++ b/recipes-application/graphics/okular.inc @@ -44,12 +44,12 @@ PACKAGES += " \ ${PN}-shared \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/okularkirigami \ ${datadir}/applications/org.kde.okular.kirigami.desktop \ " -FILES_${PN}-shared = " \ +FILES:${PN}-shared = " \ ${datadir}/okular/pics \ ${datadir}/okular/icons \ ${datadir}/qlogging-categories5 \ @@ -82,15 +82,15 @@ FILES_${PN}-shared = " \ ${libdir} \ " -FILES_${PN}-desktop = " \ +FILES:${PN}-desktop = " \ ${bindir}/okular \ ${datadir}/applications/org.kde.okular.desktop \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PN}-shared \ " -RDEPENDS_${PN}-desktop += " \ +RDEPENDS:${PN}-desktop += " \ ${PN}-shared \ " diff --git a/recipes-application/network/kdeconnect-kde.inc b/recipes-application/network/kdeconnect-kde.inc index 2657093..3d61e05 100644 --- a/recipes-application/network/kdeconnect-kde.inc +++ b/recipes-application/network/kdeconnect-kde.inc @@ -39,7 +39,7 @@ EXTRA_OECMAKE += "-DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST}" # workaround for missing variable, which is only used for Windows builds EXTRA_OECMAKE += "-DCMAKE_SYSTEM_VERSION=0.0.0" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/Thunar \ ${datadir}/contractor \ ${datadir}/kdeconnect \ @@ -49,6 +49,6 @@ FILES_${PN} += " \ ${datadir}/zsh \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ kpeoplevcard \ " diff --git a/recipes-application/utilities/konsole.inc b/recipes-application/utilities/konsole.inc index b6119ab..89c1627 100644 --- a/recipes-application/utilities/konsole.inc +++ b/recipes-application/utilities/konsole.inc @@ -25,6 +25,6 @@ inherit kconfig inherit kauth FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/knsrcfiles \ " diff --git a/recipes-extragear/edu/gcompris.inc b/recipes-extragear/edu/gcompris.inc index 8eab88e..d81ee91 100644 --- a/recipes-extragear/edu/gcompris.inc +++ b/recipes-extragear/edu/gcompris.inc @@ -21,7 +21,7 @@ DEPENDS += " \ qtdeclarative \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtdeclarative-qmlplugins \ qtgraphicaleffects-qmlplugins \ qtmultimedia-qmlplugins \ @@ -37,7 +37,7 @@ inherit kconfig inherit kauth inherit mime-xdg -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/gcompris-qt/rcc \ ${datadir}/gcompris-qt/translations \ " diff --git a/recipes-integration/packagegroups/packagegroup-kde-applications.bb b/recipes-integration/packagegroups/packagegroup-kde-applications.bb index d0f8a75..a02e8b3 100644 --- a/recipes-integration/packagegroups/packagegroup-kde-applications.bb +++ b/recipes-integration/packagegroups/packagegroup-kde-applications.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ kdialog \ kirigami-gallery \ konsole \ diff --git a/recipes-integration/packagegroups/packagegroup-plasma-mobile-applications.bb b/recipes-integration/packagegroups/packagegroup-plasma-mobile-applications.bb index 6792f40..f204cd3 100644 --- a/recipes-integration/packagegroups/packagegroup-plasma-mobile-applications.bb +++ b/recipes-integration/packagegroups/packagegroup-plasma-mobile-applications.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ alligator \ calindori \ kasts \ diff --git a/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb b/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb index e241f0a..1dac4ce 100644 --- a/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb +++ b/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb @@ -14,7 +14,7 @@ inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "wayland x11 kde" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ bluedevil \ breeze \ discover \ diff --git a/recipes-integration/packagegroups/packagegroup-plasma-mobile.bb b/recipes-integration/packagegroups/packagegroup-plasma-mobile.bb index 1feeaa6..0df8beb 100644 --- a/recipes-integration/packagegroups/packagegroup-plasma-mobile.bb +++ b/recipes-integration/packagegroups/packagegroup-plasma-mobile.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-plasma-mobile-workspace \ packagegroup-plasma-mobile-applications \ " diff --git a/recipes-meta-oe-backports/dunfell-support/modemmanager_1.14.6.bb b/recipes-meta-oe-backports/dunfell-support/modemmanager_1.14.6.bb index d0a0ce3..393f82f 100644 --- a/recipes-meta-oe-backports/dunfell-support/modemmanager_1.14.6.bb +++ b/recipes-meta-oe-backports/dunfell-support/modemmanager_1.14.6.bb @@ -31,7 +31,7 @@ EXTRA_OECONF = " \ --with-udev-base-dir=${nonarch_base_libdir}/udev \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ @@ -40,14 +40,14 @@ FILES_${PN} += " \ ${systemd_unitdir}/system \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/ModemManager/*.la \ " -FILES_${PN}-staticdev += " \ +FILES:${PN}-staticdev += " \ ${libdir}/ModemManager/*.a \ " -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" +FILES:${PN}-dbg += "${libdir}/ModemManager/.debug" -SYSTEMD_SERVICE_${PN} = "ModemManager.service" +SYSTEMD_SERVICE:${PN} = "ModemManager.service" diff --git a/recipes-meta-oe-backports/dunfell-support/wayland-protocols_1.21.bb b/recipes-meta-oe-backports/dunfell-support/wayland-protocols_1.21.bb index 16452f8..4a5a295 100644 --- a/recipes-meta-oe-backports/dunfell-support/wayland-protocols_1.21.bb +++ b/recipes-meta-oe-backports/dunfell-support/wayland-protocols_1.21.bb @@ -18,4 +18,4 @@ UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" inherit allarch autotools pkgconfig PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" +FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" diff --git a/recipes-plasma-mobile/kasts.inc b/recipes-plasma-mobile/kasts.inc index fe6905a..392bbb3 100644 --- a/recipes-plasma-mobile/kasts.inc +++ b/recipes-plasma-mobile/kasts.inc @@ -28,6 +28,6 @@ inherit kcoreaddons FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/libKastsSolidExtras.so \ " diff --git a/recipes-plasma-mobile/kclock.inc b/recipes-plasma-mobile/kclock.inc index 7432069..8301420 100644 --- a/recipes-plasma-mobile/kclock.inc +++ b/recipes-plasma-mobile/kclock.inc @@ -26,11 +26,11 @@ inherit kcoreaddons inherit kauth inherit mime-xdg -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtdeclarative-qmlplugins \ qtquickcontrols2-qmlplugins \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/plasma/plasmoids/ \ " diff --git a/recipes-plasma-mobile/koko.inc b/recipes-plasma-mobile/koko.inc index 2090845..7de919f 100644 --- a/recipes-plasma-mobile/koko.inc +++ b/recipes-plasma-mobile/koko.inc @@ -27,6 +27,6 @@ inherit kcoreaddons inherit kauth inherit mime-xdg -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtgraphicaleffects-qmlplugins \ " diff --git a/recipes-plasma-mobile/ktrip.inc b/recipes-plasma-mobile/ktrip.inc index 7cd3471..393be82 100644 --- a/recipes-plasma-mobile/ktrip.inc +++ b/recipes-plasma-mobile/ktrip.inc @@ -23,6 +23,6 @@ inherit cmake_kdeapp inherit kconfig inherit kcoreaddons -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ kirigami-addons \ " diff --git a/recipes-plasma-mobile/kweather.inc b/recipes-plasma-mobile/kweather.inc index da889e4..b8dde4c 100644 --- a/recipes-plasma-mobile/kweather.inc +++ b/recipes-plasma-mobile/kweather.inc @@ -27,12 +27,12 @@ inherit kcoreaddons inherit kauth inherit mime-xdg -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtdeclarative-qmlplugins \ qtquickcontrols2-qmlplugins \ qtcharts-qmlplugins \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/plasma/plasmoids/ \ " diff --git a/recipes-plasma-mobile/plasma-settings.inc b/recipes-plasma-mobile/plasma-settings.inc index 5419530..b6afbec 100644 --- a/recipes-plasma-mobile/plasma-settings.inc +++ b/recipes-plasma-mobile/plasma-settings.inc @@ -19,7 +19,7 @@ DEPENDS = " \ inherit cmake_plasma inherit kdoctools -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml \ ${datadir}/kpackage \ " diff --git a/recipes-plasma/bluedevil.inc b/recipes-plasma/bluedevil.inc index 5735269..cb207b1 100644 --- a/recipes-plasma/bluedevil.inc +++ b/recipes-plasma/bluedevil.inc @@ -29,7 +29,7 @@ inherit cmake_plasma inherit mime-xdg inherit mime -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/bluedevilwizard \ ${datadir}/kpackage/kcms/ \ ${datadir}/mime/packages \ diff --git a/recipes-plasma/breeze.inc b/recipes-plasma/breeze.inc index b15506d..4559c78 100644 --- a/recipes-plasma/breeze.inc +++ b/recipes-plasma/breeze.inc @@ -24,7 +24,7 @@ DEPENDS = " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/QtQuick/Controls/Styles \ ${datadir}/kstyle/themes \ ${datadir}/plasma/look-and-feel \ @@ -34,6 +34,6 @@ FILES_${PN} += " \ ${datadir}/wallpapers \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ breeze-icons \ " diff --git a/recipes-plasma/discover.inc b/recipes-plasma/discover.inc index b5732a6..4c5520d 100644 --- a/recipes-plasma/discover.inc +++ b/recipes-plasma/discover.inc @@ -31,7 +31,7 @@ DEPENDS = " \ inherit cmake_plasma inherit mime-xdg -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/discovernotifier \ ${libdir}/plasma-discover \ ${datadir}/kpackage/kcms/kcm_updates \ diff --git a/recipes-plasma/kactivitymanagerd.inc b/recipes-plasma/kactivitymanagerd.inc index 66af24c..a0accfb 100644 --- a/recipes-plasma/kactivitymanagerd.inc +++ b/recipes-plasma/kactivitymanagerd.inc @@ -36,11 +36,11 @@ EXTRA_OECMAKE += " \ -DHAVE_CXX11_INITIALIZER_LISTS=ON \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/*.so \ ${datadir}/krunner/dbusplugins/plasma-runnners-activities.desktop \ " -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/qlogging-categories5 \ " diff --git a/recipes-plasma/kdecoration.inc b/recipes-plasma/kdecoration.inc index c96a59c..192184a 100644 --- a/recipes-plasma/kdecoration.inc +++ b/recipes-plasma/kdecoration.inc @@ -11,6 +11,6 @@ PR = "r0" inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/locale \ " diff --git a/recipes-plasma/kscreen.inc b/recipes-plasma/kscreen.inc index 738aadc..e21764d 100644 --- a/recipes-plasma/kscreen.inc +++ b/recipes-plasma/kscreen.inc @@ -24,7 +24,7 @@ DEPENDS = " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/kded_kscreen \ ${datadir}/kcm_kscreen \ ${datadir}/kpackage \ diff --git a/recipes-plasma/kscreenlocker.inc b/recipes-plasma/kscreenlocker.inc index fb1b98d..e9c654e 100644 --- a/recipes-plasma/kscreenlocker.inc +++ b/recipes-plasma/kscreenlocker.inc @@ -39,9 +39,9 @@ do_install_append() { install -m 0644 ${WORKDIR}/kde.pam ${D}${sysconfdir}/pam.d/kde } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/ksmserver/screenlocker/org.kde.passworddialog/*.desktop \ ${datadir}/kpackage/kcms/kcm_screenlocker \ " -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" diff --git a/recipes-plasma/kwayland-integration.inc b/recipes-plasma/kwayland-integration.inc index e1efdb3..69bd272 100644 --- a/recipes-plasma/kwayland-integration.inc +++ b/recipes-plasma/kwayland-integration.inc @@ -18,6 +18,6 @@ DEPENDS = " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins/kf5/kguiaddons \ " diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc index bd91b22..d56088c 100644 --- a/recipes-plasma/kwin.inc +++ b/recipes-plasma/kwin.inc @@ -59,7 +59,7 @@ do_install_append() { } FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/kconf_update_bin/kwin5_update_default_rules \ ${libdir}/plugins/*.so \ ${libdir}/plugins/kpackage/packagestructure/*.so \ @@ -85,11 +85,11 @@ FILES_${PN} += " \ ${datadir}/krunner/dbusplugins/*.desktop \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/libkwin*.so \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ maliit-keyboard-qt5 \ qtwayland-plugins \ xserver-xorg-xwayland \ diff --git a/recipes-plasma/libksysguard.inc b/recipes-plasma/libksysguard.inc index 2e8613a..1a79ff8 100644 --- a/recipes-plasma/libksysguard.inc +++ b/recipes-plasma/libksysguard.inc @@ -30,7 +30,7 @@ DEPENDS = " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/ksysguard \ ${libdir}/qml \ " diff --git a/recipes-plasma/milou.inc b/recipes-plasma/milou.inc index 92ba9fe..4664a07 100644 --- a/recipes-plasma/milou.inc +++ b/recipes-plasma/milou.inc @@ -30,7 +30,7 @@ DEPENDS = " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/milou/* \ ${datadir}/plasma/plasmoids/org.kde.milou \ " diff --git a/recipes-plasma/plasma-integration.inc b/recipes-plasma/plasma-integration.inc index 1447e48..4743484 100644 --- a/recipes-plasma/plasma-integration.inc +++ b/recipes-plasma/plasma-integration.inc @@ -26,7 +26,7 @@ DEPENDS = " \ inherit cmake_plasma -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ perl \ qtquickcontrols \ " diff --git a/recipes-plasma/plasma-nano.inc b/recipes-plasma/plasma-nano.inc index f16d099..29d5fa1 100644 --- a/recipes-plasma/plasma-nano.inc +++ b/recipes-plasma/plasma-nano.inc @@ -22,13 +22,13 @@ DEPENDS = " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/plasma/ \ ${datadir}/plasma/shells/org.kde.plasma.nano/ \ ${datadir}/plasma/packages/org.kde.plasma.nano.desktoptoolbox/ \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtdeclarative \ plasma-workspace \ " diff --git a/recipes-plasma/plasma-nm.inc b/recipes-plasma/plasma-nm.inc index 08b1e11..4082c72 100644 --- a/recipes-plasma/plasma-nm.inc +++ b/recipes-plasma/plasma-nm.inc @@ -42,7 +42,7 @@ EXTRA_OECMAKE += " \ " FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/*.so \ ${libdir}/plugins/plasma/network/vpn/*.so \ ${libdir}/qml/org/kde/plasma/networkmanagement \ diff --git a/recipes-plasma/plasma-pa.inc b/recipes-plasma/plasma-pa.inc index 47b140b..7d3f52f 100644 --- a/recipes-plasma/plasma-pa.inc +++ b/recipes-plasma/plasma-pa.inc @@ -31,11 +31,11 @@ DEPENDS = " \ inherit cmake_plasma inherit kdoctools -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/org/kde/plasma/private/volume/* \ ${datadir}/kpackage/kcms/kcm_pulseaudio \ ${datadir}/plasma/plasmoids/org.kde.plasma.volume \ ${datadir}/kde4/apps/kconf_update/* \ " -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" diff --git a/recipes-plasma/plasma-phone-components.inc b/recipes-plasma/plasma-phone-components.inc index dc0b085..6e68c3d 100644 --- a/recipes-plasma/plasma-phone-components.inc +++ b/recipes-plasma/plasma-phone-components.inc @@ -30,7 +30,7 @@ DEPENDS = " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qml/QtQuick/VirtualKeyboard/Styles/Plasma/* \ ${libdir}/qml/org/kde/plasma/private/mobileshell/* \ ${libdir}/qml/org/kde/plasma/private/kpeoplehelper/* \ @@ -48,7 +48,7 @@ FILES_${PN} += " \ ${datadir}/wayland-sessions/*.desktop \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libqofono \ kded \ qtgraphicaleffects \ diff --git a/recipes-plasma/plasma-systemmonitor.inc b/recipes-plasma/plasma-systemmonitor.inc index f73fca8..504bcc0 100644 --- a/recipes-plasma/plasma-systemmonitor.inc +++ b/recipes-plasma/plasma-systemmonitor.inc @@ -27,7 +27,7 @@ DEPENDS = " \ inherit cmake_plasma inherit kdoctools -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/ksysguard/sensorfaces/ \ ${libdir}/qml/org/kde/ksysguard/table/ \ ${libdir}/qml/org/kde/ksysguard/page/ \ diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc index ed68c35..1733e19 100644 --- a/recipes-plasma/plasma-workspace.inc +++ b/recipes-plasma/plasma-workspace.inc @@ -60,7 +60,7 @@ inherit mime-xdg EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF" FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/desktop-directories/*.directory \ ${datadir}/kcontrol \ ${datadir}/kdisplay \ @@ -88,7 +88,7 @@ FILES_${PN} += " \ ${libdir}/qml/org/kde \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/libcolorcorrect.so \ ${libdir}/libnotificationmanager.so \ ${libdir}/libkfontinst.so \ @@ -99,7 +99,7 @@ FILES_${PN}-dev += " \ ${libdir}/libweather_ion.so \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ kinit \ kquickcharts \ milou \ diff --git a/recipes-plasma/systemsettings.inc b/recipes-plasma/systemsettings.inc index 1a47dbb..94d2d0c 100644 --- a/recipes-plasma/systemsettings.inc +++ b/recipes-plasma/systemsettings.inc @@ -31,10 +31,10 @@ DEPENDS += " \ inherit cmake_plasma inherit kdoctools -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/kpackage/genericqml/org.kde.systemsettings.sidebar \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtquickcontrols-qmlplugins \ " diff --git a/recipes-plasma/xdg-desktop-portal-kde.inc b/recipes-plasma/xdg-desktop-portal-kde.inc index 31ae275..8f05883 100644 --- a/recipes-plasma/xdg-desktop-portal-kde.inc +++ b/recipes-plasma/xdg-desktop-portal-kde.inc @@ -30,6 +30,6 @@ DEPENDS += " \ inherit cmake_plasma -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/xdg-desktop-portal \ " diff --git a/recipes-playground/arkade.inc b/recipes-playground/arkade.inc index 4184641..81724bb 100644 --- a/recipes-playground/arkade.inc +++ b/recipes-playground/arkade.inc @@ -23,12 +23,12 @@ S = "${WORKDIR}/git" inherit cmake_kdeapp inherit mime-xdg -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtdeclarative-qmlplugins \ qtquickcontrols2-qmlplugins \ " -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/game/packages/org.kde.arkade.fourinline \ ${datadir}/game/packages/org.kde.arkade.samegame \ ${datadir}/game/packages/org.kde.arkade.blocktennis \ diff --git a/recipes-playground/kjournald.inc b/recipes-playground/kjournald.inc index 623d3a4..7d944de 100644 --- a/recipes-playground/kjournald.inc +++ b/recipes-playground/kjournald.inc @@ -26,16 +26,16 @@ PACKAGES += " \ ${PN}-browser \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir} \ " -FILES_${PN}-browser = " \ +FILES:${PN}-browser = " \ ${bindir}/journald-browser \ ${datadir}/applications \ ${datadir}/metainfo \ " -RDEPENDS_${PN}-browser += " \ +RDEPENDS:${PN}-browser += " \ qtdeclarative-qmlplugins \ " diff --git a/recipes-playground/plasma-camera.inc b/recipes-playground/plasma-camera.inc index 130b484..f0eeb76 100644 --- a/recipes-playground/plasma-camera.inc +++ b/recipes-playground/plasma-camera.inc @@ -18,4 +18,4 @@ S = "${WORKDIR}/git" inherit cmake_kdeapp -RDEPENDS_${PN} += "qtmultimedia-qmlplugins" +RDEPENDS:${PN} += "qtmultimedia-qmlplugins" diff --git a/recipes-support/libchewing.inc b/recipes-support/libchewing.inc index 7c2dbcf..f029fcf 100644 --- a/recipes-support/libchewing.inc +++ b/recipes-support/libchewing.inc @@ -20,7 +20,7 @@ DEPENDS = " \ ${PN}-native \ " -DEPENDS_class-native = " \ +DEPENDS:class-native = " \ ncurses \ sqlite3 \ " @@ -28,6 +28,6 @@ DEPENDS_class-native = " \ inherit cmake EXTRA_OECMAKE += "-DUSE_TOOLS_FROM_PATH=ON" -EXTRA_OECMAKE_class-native += "-DINSTALL_TOOLS=ON" +EXTRA_OECMAKE:class-native += "-DINSTALL_TOOLS=ON" BBCLASSEXTEND = "native" diff --git a/recipes-support/libpinyin.inc b/recipes-support/libpinyin.inc index 3aa0fb8..165c33a 100644 --- a/recipes-support/libpinyin.inc +++ b/recipes-support/libpinyin.inc @@ -14,7 +14,7 @@ SRC_URI = " \ file://0002-Provide-option-to-use-pre-downloaded-archive.patch \ file://0004-Fix-header-installation-path.patch \ " -SRC_URI_class-native = " \ +SRC_URI:class-native = " \ git://github.com/libpinyin/libpinyin.git;nobranch=1 \ file://0001-Optionally-install-utilities.patch \ file://0002-Provide-option-to-use-pre-downloaded-archive.patch \ @@ -29,7 +29,7 @@ DEPENDS = " \ glib-2.0 \ libpinyin-native \ " -DEPENDS_class-native = " \ +DEPENDS:class-native = " \ db \ glib-2.0 \ " @@ -37,7 +37,7 @@ DEPENDS_class-native = " \ inherit cmake EXTRA_OECMAKE += "-DDOWNLOAD_MODEL_DATA_ARCHIVE=OFF" -EXTRA_OECMAKE_class-native += "-DINSTALL_UTILS=ON -DDISABLE_DATA_GENERATION=ON" +EXTRA_OECMAKE:class-native += "-DINSTALL_UTILS=ON -DDISABLE_DATA_GENERATION=ON" # workaround for generator that can be executed only once: # https://github.com/libpinyin/libpinyin/issues/128 diff --git a/recipes-support/libreoffice-dictionaries_6.4.5.2.bb b/recipes-support/libreoffice-dictionaries_6.4.5.2.bb index 2208cec..1440054 100644 --- a/recipes-support/libreoffice-dictionaries_6.4.5.2.bb +++ b/recipes-support/libreoffice-dictionaries_6.4.5.2.bb @@ -23,6 +23,6 @@ do_install() { cp ${S}/*/*.aff ${D}/${datadir}/hunspell } -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/hunspell \ " diff --git a/recipes-support/maliit-framework-qt5.inc b/recipes-support/maliit-framework-qt5.inc index 24c262d..501d74a 100644 --- a/recipes-support/maliit-framework-qt5.inc +++ b/recipes-support/maliit-framework-qt5.inc @@ -30,11 +30,11 @@ EXTRA_OECMAKE += " \ -DQT5_PLUGINS_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/plugins \ ${datadir}/dbus-1/ \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/qt5/mkspecs \ " diff --git a/recipes-support/maliit-keyboard-qt5.inc b/recipes-support/maliit-keyboard-qt5.inc index 8fd665d..429fc59 100644 --- a/recipes-support/maliit-keyboard-qt5.inc +++ b/recipes-support/maliit-keyboard-qt5.inc @@ -26,7 +26,7 @@ inherit gsettings EXTRA_OECMAKE += "-Denable-presage=OFF" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/glib-2.0/schemas/org.maliit.keyboard.maliit.gschema.xml \ ${datadir}/maliit/keyboard2/themes \ ${datadir}/maliit/keyboard2/styles \ diff --git a/recipes-support/qca.inc b/recipes-support/qca.inc index d31a06e..3f62dae 100644 --- a/recipes-support/qca.inc +++ b/recipes-support/qca.inc @@ -22,11 +22,11 @@ do_install_prepend() { fi } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/qca-qt5/crypto/libqca-*.so \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${prefix}/mkspecs/features/* \ ${libdir}/cmake/Qca-qt5/*.cmake \ " diff --git a/recipes-support/qtkeychain.inc b/recipes-support/qtkeychain.inc index b4f3c6d..144ef7c 100644 --- a/recipes-support/qtkeychain.inc +++ b/recipes-support/qtkeychain.inc @@ -20,10 +20,10 @@ S = "${WORKDIR}/git" inherit cmake_qt5 -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/qt5keychain/translations \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${prefix}/mkspecs \ " diff --git a/recipes-support/sddm/sddm.inc b/recipes-support/sddm/sddm.inc index c07bc1b..ed38399 100644 --- a/recipes-support/sddm/sddm.inc +++ b/recipes-support/sddm/sddm.inc @@ -65,14 +65,14 @@ do_install_append() { echo "WantedBy=multi-user.target" >> ${D}/${systemd_unitdir}/system/sddm.service } -FILES_${PN} += "${OE_QMAKE_PATH_QML}" +FILES:${PN} += "${OE_QMAKE_PATH_QML}" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ bash \ packagegroup-core-x11-xserver \ xcb-util \ @@ -86,7 +86,7 @@ RDEPENDS_${PN} += "\ pam-plugin-tally \ " -RRECOMMENDS_${PN} += " \ +RRECOMMENDS:${PN} += " \ qtvirtualkeyboard-plugins \ qtvirtualkeyboard-qmlplugins \ " diff --git a/recipes-support/simplelogin.inc b/recipes-support/simplelogin.inc index 6e2fab1..a82e139 100644 --- a/recipes-support/simplelogin.inc +++ b/recipes-support/simplelogin.inc @@ -20,4 +20,4 @@ S = "${WORKDIR}/git" inherit cmake_qt5 inherit systemd -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" diff --git a/recipes-support/telepathy-qt.inc b/recipes-support/telepathy-qt.inc index dcf18c3..21468e5 100644 --- a/recipes-support/telepathy-qt.inc +++ b/recipes-support/telepathy-qt.inc @@ -21,7 +21,7 @@ inherit cmake_qt5 python3native EXTRA_OECMAKE += " -DDESIRED_QT_VERSION=5 -DENABLE_TESTS=FALSE -DENABLE_FARSTREAM=FALSE -DENABLE_EXAMPLES=FALSE" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/cmake/TelepathyQt5/* \ ${libdir}/cmake/TelepathyQt5Service/* \ " diff --git a/recipes-support/ttf-noto-cjk_2019.03.30.bb b/recipes-support/ttf-noto-cjk_2019.03.30.bb index 18c6d2f..4556167 100644 --- a/recipes-support/ttf-noto-cjk_2019.03.30.bb +++ b/recipes-support/ttf-noto-cjk_2019.03.30.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" PACKAGES = "ttf-noto-cjk" FONT_PACKAGES = "ttf-noto-cjk" -FILES_${PN} = " ${datadir}/fonts/truetype/ " +FILES:${PN} = " ${datadir}/fonts/truetype/ " do_compile[noexec] = "1" diff --git a/recipes-support/ttf-noto_2019.01.11.bb b/recipes-support/ttf-noto_2019.01.11.bb index c63cf3e..f21bb25 100644 --- a/recipes-support/ttf-noto_2019.01.11.bb +++ b/recipes-support/ttf-noto_2019.01.11.bb @@ -25,7 +25,7 @@ S = "${WORKDIR}/git" PACKAGES = "ttf-noto" FONT_PACKAGES = "ttf-noto" -FILES_${PN} = " ${datadir}/fonts/truetype/ " +FILES:${PN} = " ${datadir}/fonts/truetype/ " do_install() { install -d ${D}${datadir}/fonts/truetype/