From 7ea59f18dd221ca67619a63e3a68c4e4e6b17086 Mon Sep 17 00:00:00 2001 From: Hannah Kiekens Date: Sat, 29 Jan 2022 13:26:34 +0100 Subject: [PATCH] Convert missing override syntax changes --- classes/cmake_kdeapp.bbclass | 2 +- classes/cmake_plasma.bbclass | 2 +- recipes-application/graphics/okular.inc | 2 +- recipes-graphics/wayland/wayland_%.bbappend | 2 +- recipes-plasma/kscreenlocker.inc | 4 ++-- recipes-plasma/kwin.inc | 4 ++-- recipes-support/libpinyin.inc | 2 +- recipes-support/poppler/poppler_%.bbappend | 2 +- recipes-support/qca.inc | 2 +- recipes-support/sddm/sddm.inc | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/classes/cmake_kdeapp.bbclass b/classes/cmake_kdeapp.bbclass index 147e936..affb3bf 100644 --- a/classes/cmake_kdeapp.bbclass +++ b/classes/cmake_kdeapp.bbclass @@ -17,7 +17,7 @@ DEPENDS += " \ kpackage-native \ " -do_configure_prepend() { +do_configure:prepend() { # kpackagetool5 needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass index 41918b1..fd5c683 100644 --- a/classes/cmake_plasma.bbclass +++ b/classes/cmake_plasma.bbclass @@ -20,7 +20,7 @@ DEPENDS += " \ kpackage-native \ " -do_configure_prepend() { +do_configure:prepend() { # kpackagetool5 needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } diff --git a/recipes-application/graphics/okular.inc b/recipes-application/graphics/okular.inc index 0481f41..6d2da23 100644 --- a/recipes-application/graphics/okular.inc +++ b/recipes-application/graphics/okular.inc @@ -26,7 +26,7 @@ DEPENDS += " \ " # dirty hack to force the mobile version and hide the desktop one -do_install_append() { +do_install:append() { sed -i 's/Exec=okular %U$/Exec=okularkirigami %U/g' ${D}${datadir}/applications/org.kde.okular.desktop } diff --git a/recipes-graphics/wayland/wayland_%.bbappend b/recipes-graphics/wayland/wayland_%.bbappend index 9fed37b..6ea0907 100644 --- a/recipes-graphics/wayland/wayland_%.bbappend +++ b/recipes-graphics/wayland/wayland_%.bbappend @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Volker Krause # SPDX-License-Identifier: MIT -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://0001-Consider-pkgconfig-sysroot-for-pkgdatadir.patch \ " diff --git a/recipes-plasma/kscreenlocker.inc b/recipes-plasma/kscreenlocker.inc index e9c654e..1268ebe 100644 --- a/recipes-plasma/kscreenlocker.inc +++ b/recipes-plasma/kscreenlocker.inc @@ -28,13 +28,13 @@ DEPENDS = " \ wayland-native \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://kde.pam \ " inherit cmake_plasma -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/pam.d install -m 0644 ${WORKDIR}/kde.pam ${D}${sysconfdir}/pam.d/kde } diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc index d56088c..60380c4 100644 --- a/recipes-plasma/kwin.inc +++ b/recipes-plasma/kwin.inc @@ -44,13 +44,13 @@ DEPENDS = " \ libinput \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://kwinrc \ " inherit cmake_plasma kdoctools -do_install_append() { +do_install:append() { # dirty workaround for aurora crash on Wayland rm -rf ${D}/${libdir}/plugins/org.kde.kdecoration2/ diff --git a/recipes-support/libpinyin.inc b/recipes-support/libpinyin.inc index 165c33a..ddcaffd 100644 --- a/recipes-support/libpinyin.inc +++ b/recipes-support/libpinyin.inc @@ -41,7 +41,7 @@ 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 -do_install_prepend() { +do_install:prepend() { rm -f ${WORKDIR}/build/data/*.bin rm -f ${WORKDIR}/build/data/*.db } diff --git a/recipes-support/poppler/poppler_%.bbappend b/recipes-support/poppler/poppler_%.bbappend index 14a718c..4dae086 100644 --- a/recipes-support/poppler/poppler_%.bbappend +++ b/recipes-support/poppler/poppler_%.bbappend @@ -2,5 +2,5 @@ # # SPDX-License-Identifier: MIT -PACKAGECONFIG_append = " qt5" +PACKAGECONFIG:append = " qt5" inherit cmake_qt5 diff --git a/recipes-support/qca.inc b/recipes-support/qca.inc index 3f62dae..b2081a5 100644 --- a/recipes-support/qca.inc +++ b/recipes-support/qca.inc @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" inherit cmake_qt5 -do_install_prepend() { +do_install:prepend() { if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then sed -i 's/\"\/usr\//\"\$\{OE_QCA_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) sed -i 's/\;\/usr\//\;\$\{OE_QCA_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) diff --git a/recipes-support/sddm/sddm.inc b/recipes-support/sddm/sddm.inc index ed38399..db2b17e 100644 --- a/recipes-support/sddm/sddm.inc +++ b/recipes-support/sddm/sddm.inc @@ -44,12 +44,12 @@ EXTRA_OECMAKE += " \ -DSYSTEMD_SYSTEM_UNIT_DIR=${systemd_unitdir}/system \ " -do_configure_append() { +do_configure:append() { # fix sysroot path sed -i 's:${STAGING_DIR_HOST}.*${libdir}:${libdir}:g' ${B}/src/common/Constants.h } -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/sddm.conf.d install -m 644 ${WORKDIR}/sddm.conf ${D}/${sysconfdir}/sddm.conf.d/00-default.conf