From 74ab4dee1aaa0a6675346b8744c543ebf1cdd94f Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Mon, 17 Apr 2023 20:26:22 +0200 Subject: [PATCH] adapt all inherit commands for updated class names from Qt6/KF6 --- classes/cmake_kdeapp.bbclass | 6 +++--- classes/cmake_plasma.bbclass | 14 +++++++------- recipes-application/education/blinken.inc | 6 +++--- recipes-application/education/kanagram.inc | 6 +++--- recipes-application/education/khangman.inc | 6 +++--- .../education/libkeduvocdocument.inc | 4 ++-- recipes-application/education/marble.inc | 6 +++--- recipes-application/graphics/gwenview.inc | 6 +++--- recipes-application/graphics/okular.inc | 6 +++--- recipes-application/multimedia/elisa.inc | 6 +++--- recipes-application/network/kdeconnect-kde.inc | 8 ++++---- recipes-application/utilities/kdialog.inc | 6 +++--- recipes-application/utilities/konsole.inc | 6 +++--- recipes-extragear/edu/gcompris.inc | 8 ++++---- recipes-extragear/libraries/pulseaudio-qt.inc | 2 +- recipes-plasma-mobile/alligator.inc | 4 ++-- recipes-plasma-mobile/calindori.inc | 2 +- recipes-plasma-mobile/kasts.inc | 4 ++-- recipes-plasma-mobile/kclock.inc | 6 +++--- recipes-plasma-mobile/koko.inc | 6 +++--- recipes-plasma-mobile/kongress.inc | 2 +- recipes-plasma-mobile/krecorder.inc | 4 ++-- recipes-plasma-mobile/ktrip.inc | 4 ++-- recipes-plasma-mobile/kweather.inc | 6 +++--- recipes-plasma-mobile/plasma-settings.inc | 2 +- recipes-plasma/kscreen.inc | 2 +- recipes-plasma/kwin.inc | 10 +++++----- recipes-plasma/plasma-pa.inc | 2 +- recipes-plasma/plasma-systemmonitor.inc | 2 +- recipes-support/kpeoplevcard.inc | 4 ++-- recipes-support/maliit-framework-qt5.inc | 2 +- recipes-support/maliit-keyboard-qt5.inc | 2 +- recipes-support/poppler/poppler_%.bbappend | 2 +- recipes-support/qtfeedback_git.bb | 2 +- recipes-support/qtkeychain.inc | 2 +- recipes-support/sddm/sddm.inc | 2 +- recipes-support/simplelogin.inc | 2 +- recipes-support/telepathy-qt.inc | 2 +- 38 files changed, 86 insertions(+), 86 deletions(-) diff --git a/classes/cmake_kdeapp.bbclass b/classes/cmake_kdeapp.bbclass index 8995462..cbcde83 100644 --- a/classes/cmake_kdeapp.bbclass +++ b/classes/cmake_kdeapp.bbclass @@ -2,9 +2,9 @@ # # SPDX-License-Identifier: MIT -inherit cmake_qt5 -inherit ki18n -inherit kdoctools +inherit qt6-cmake +inherit kf6-ki18n +inherit kf6-kdoctools inherit pkgconfig EXTRA_OECMAKE:append = " \ diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass index f09a42b..190872b 100644 --- a/classes/cmake_plasma.bbclass +++ b/classes/cmake_plasma.bbclass @@ -3,13 +3,13 @@ # # SPDX-License-Identifier: MIT -inherit cmake_qt5 -inherit ki18n -inherit kcoreaddons -inherit kconfig -inherit kauth -inherit kcmutils -inherit kdoctools +inherit qt6-cmake +inherit kf6-ki18n +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth +inherit kf6-kcmutils +inherit kf6-kdoctools inherit pkgconfig EXTRA_OECMAKE:append = " \ diff --git a/recipes-application/education/blinken.inc b/recipes-application/education/blinken.inc index c0910f6..d412a0f 100644 --- a/recipes-application/education/blinken.inc +++ b/recipes-application/education/blinken.inc @@ -17,7 +17,7 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg diff --git a/recipes-application/education/kanagram.inc b/recipes-application/education/kanagram.inc index 144701e..88f28e2 100644 --- a/recipes-application/education/kanagram.inc +++ b/recipes-application/education/kanagram.inc @@ -21,9 +21,9 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg RDEPENDS:${PN} += " \ diff --git a/recipes-application/education/khangman.inc b/recipes-application/education/khangman.inc index 6e05f52..d17170b 100644 --- a/recipes-application/education/khangman.inc +++ b/recipes-application/education/khangman.inc @@ -23,9 +23,9 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg RDEPENDS:${PN} += " \ diff --git a/recipes-application/education/libkeduvocdocument.inc b/recipes-application/education/libkeduvocdocument.inc index 0889125..08a096c 100644 --- a/recipes-application/education/libkeduvocdocument.inc +++ b/recipes-application/education/libkeduvocdocument.inc @@ -16,5 +16,5 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kconfig -inherit kauth +inherit kf6-kconfig +inherit kf6-kauth diff --git a/recipes-application/education/marble.inc b/recipes-application/education/marble.inc index f1ef889..bbc7d2b 100644 --- a/recipes-application/education/marble.inc +++ b/recipes-application/education/marble.inc @@ -24,9 +24,9 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg EXTRA_OECMAKE += "-DBUILD_TOUCH=ON" diff --git a/recipes-application/graphics/gwenview.inc b/recipes-application/graphics/gwenview.inc index 99719d9..9b9d5ea 100644 --- a/recipes-application/graphics/gwenview.inc +++ b/recipes-application/graphics/gwenview.inc @@ -28,9 +28,9 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg EXTRA_OECMAKE += "-DJPEGLIB_RUN_RESULT=true" diff --git a/recipes-application/graphics/okular.inc b/recipes-application/graphics/okular.inc index 8dd2fad..849b80c 100644 --- a/recipes-application/graphics/okular.inc +++ b/recipes-application/graphics/okular.inc @@ -32,9 +32,9 @@ do_install:append() { } inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg EXTRA_OECMAKE += " -DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST} -DOKULAR_UI=both" diff --git a/recipes-application/multimedia/elisa.inc b/recipes-application/multimedia/elisa.inc index 95ccda1..6ae14da 100644 --- a/recipes-application/multimedia/elisa.inc +++ b/recipes-application/multimedia/elisa.inc @@ -25,7 +25,7 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg diff --git a/recipes-application/network/kdeconnect-kde.inc b/recipes-application/network/kdeconnect-kde.inc index 07b0a0d..b11aa60 100644 --- a/recipes-application/network/kdeconnect-kde.inc +++ b/recipes-application/network/kdeconnect-kde.inc @@ -27,11 +27,11 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg -inherit kcmutils +inherit kf6-kcmutils EXTRA_OECMAKE += "-DEXPERIMENTALAPP_ENABLED=ON" EXTRA_OECMAKE += "-DSMSAPP_ENABLED=OFF" diff --git a/recipes-application/utilities/kdialog.inc b/recipes-application/utilities/kdialog.inc index 2c01114..4dff066 100644 --- a/recipes-application/utilities/kdialog.inc +++ b/recipes-application/utilities/kdialog.inc @@ -18,6 +18,6 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth diff --git a/recipes-application/utilities/konsole.inc b/recipes-application/utilities/konsole.inc index f9b6ec3..1d6cacd 100644 --- a/recipes-application/utilities/konsole.inc +++ b/recipes-application/utilities/konsole.inc @@ -20,9 +20,9 @@ DEPENDS += " \ " inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth FILES_SOLIBSDEV = "" FILES:${PN} += " \ diff --git a/recipes-extragear/edu/gcompris.inc b/recipes-extragear/edu/gcompris.inc index c8b9407..e74a15d 100644 --- a/recipes-extragear/edu/gcompris.inc +++ b/recipes-extragear/edu/gcompris.inc @@ -30,11 +30,11 @@ RDEPENDS:${PN} += " \ SRC_URI = "git://invent.kde.org/education/${BPN};nobranch=1;protocol=https" S = "${WORKDIR}/git" -inherit qmake5_base +inherit qt6-qmake inherit cmake_kdeapp -inherit kcoreaddons -inherit kconfig -inherit kauth +inherit kf6-kcoreaddons +inherit kf6-kconfig +inherit kf6-kauth inherit mime-xdg FILES:${PN} += " \ diff --git a/recipes-extragear/libraries/pulseaudio-qt.inc b/recipes-extragear/libraries/pulseaudio-qt.inc index d7ded8f..7beb8fb 100644 --- a/recipes-extragear/libraries/pulseaudio-qt.inc +++ b/recipes-extragear/libraries/pulseaudio-qt.inc @@ -15,4 +15,4 @@ DEPENDS = " \ SRC_URI = "git://invent.kde.org/libraries/${BPN};nobranch=1;protocol=https" S = "${WORKDIR}/git" -inherit cmake_kf5 +inherit kf6-cmake diff --git a/recipes-plasma-mobile/alligator.inc b/recipes-plasma-mobile/alligator.inc index f2acab1..503cbd7 100644 --- a/recipes-plasma-mobile/alligator.inc +++ b/recipes-plasma-mobile/alligator.inc @@ -18,5 +18,5 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig -inherit kcoreaddons +inherit kf6-kconfig +inherit kf6-kcoreaddons diff --git a/recipes-plasma-mobile/calindori.inc b/recipes-plasma-mobile/calindori.inc index 648b0d3..45a735a 100644 --- a/recipes-plasma-mobile/calindori.inc +++ b/recipes-plasma-mobile/calindori.inc @@ -17,5 +17,5 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig +inherit kf6-kconfig inherit mime-xdg diff --git a/recipes-plasma-mobile/kasts.inc b/recipes-plasma-mobile/kasts.inc index e18e7cb..c6d2a62 100644 --- a/recipes-plasma-mobile/kasts.inc +++ b/recipes-plasma-mobile/kasts.inc @@ -26,8 +26,8 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig -inherit kcoreaddons +inherit kf6-kconfig +inherit kf6-kcoreaddons FILES_SOLIBSDEV = "" diff --git a/recipes-plasma-mobile/kclock.inc b/recipes-plasma-mobile/kclock.inc index b705260..39b3053 100644 --- a/recipes-plasma-mobile/kclock.inc +++ b/recipes-plasma-mobile/kclock.inc @@ -22,9 +22,9 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig -inherit kcoreaddons -inherit kauth +inherit kf6-kconfig +inherit kf6-kcoreaddons +inherit kf6-kauth inherit mime-xdg RDEPENDS:${PN} += " \ diff --git a/recipes-plasma-mobile/koko.inc b/recipes-plasma-mobile/koko.inc index 9dfae09..7451855 100644 --- a/recipes-plasma-mobile/koko.inc +++ b/recipes-plasma-mobile/koko.inc @@ -22,9 +22,9 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig -inherit kcoreaddons -inherit kauth +inherit kf6-kconfig +inherit kf6-kcoreaddons +inherit kf6-kauth inherit mime-xdg RDEPENDS:${PN} += " \ diff --git a/recipes-plasma-mobile/kongress.inc b/recipes-plasma-mobile/kongress.inc index fe02a8d..de85205 100644 --- a/recipes-plasma-mobile/kongress.inc +++ b/recipes-plasma-mobile/kongress.inc @@ -19,4 +19,4 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig +inherit kf6-kconfig diff --git a/recipes-plasma-mobile/krecorder.inc b/recipes-plasma-mobile/krecorder.inc index da3315b..64d9198 100644 --- a/recipes-plasma-mobile/krecorder.inc +++ b/recipes-plasma-mobile/krecorder.inc @@ -19,5 +19,5 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig -inherit kcoreaddons +inherit kf6-kconfig +inherit kf6-kcoreaddons diff --git a/recipes-plasma-mobile/ktrip.inc b/recipes-plasma-mobile/ktrip.inc index 393be82..f9cd4f9 100644 --- a/recipes-plasma-mobile/ktrip.inc +++ b/recipes-plasma-mobile/ktrip.inc @@ -20,8 +20,8 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig -inherit kcoreaddons +inherit kf6-kconfig +inherit kf6-kcoreaddons RDEPENDS:${PN} += " \ kirigami-addons \ diff --git a/recipes-plasma-mobile/kweather.inc b/recipes-plasma-mobile/kweather.inc index 5478356..5346c54 100644 --- a/recipes-plasma-mobile/kweather.inc +++ b/recipes-plasma-mobile/kweather.inc @@ -23,9 +23,9 @@ DEPENDS = " \ " inherit cmake_kdeapp -inherit kconfig -inherit kcoreaddons -inherit kauth +inherit kf6-kconfig +inherit kf6-kcoreaddons +inherit kf6-kauth inherit mime-xdg RDEPENDS:${PN} += " \ diff --git a/recipes-plasma-mobile/plasma-settings.inc b/recipes-plasma-mobile/plasma-settings.inc index c19e30f..b7f3784 100644 --- a/recipes-plasma-mobile/plasma-settings.inc +++ b/recipes-plasma-mobile/plasma-settings.inc @@ -18,7 +18,7 @@ DEPENDS = " \ " inherit cmake_plasma -inherit kdoctools +inherit kf6-kdoctools FILES:${PN} += " \ ${libdir}/qml \ diff --git a/recipes-plasma/kscreen.inc b/recipes-plasma/kscreen.inc index ea6a1c0..ec166ee 100644 --- a/recipes-plasma/kscreen.inc +++ b/recipes-plasma/kscreen.inc @@ -23,7 +23,7 @@ DEPENDS = " \ " inherit cmake_plasma -inherit kcmutils +inherit kf6-kcmutils FILES:${PN} += " \ ${datadir}/kded_kscreen \ diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc index df86ce0..eb51849 100644 --- a/recipes-plasma/kwin.inc +++ b/recipes-plasma/kwin.inc @@ -72,11 +72,11 @@ EXTRA_OECMAKE:append:class-target = " \ -DBUILD_TESTING=OFF \ " -inherit kauth -inherit kcmutils -inherit kconfig -inherit kdoctools -inherit cmake_qt5 +inherit kf6-kauth +inherit kf6-kcmutils +inherit kf6-kconfig +inherit kf6-kdoctools +inherit qt6-cmake inherit pkgconfig # TODO skip inherit of cmake_plasma for now because it leads to build errors for native package diff --git a/recipes-plasma/plasma-pa.inc b/recipes-plasma/plasma-pa.inc index c60189f..6635740 100644 --- a/recipes-plasma/plasma-pa.inc +++ b/recipes-plasma/plasma-pa.inc @@ -29,7 +29,7 @@ DEPENDS = " \ " inherit cmake_plasma -inherit kdoctools +inherit kf6-kdoctools FILES:${PN} += " \ ${libdir}/qml/org/kde/plasma/private/volume/* \ diff --git a/recipes-plasma/plasma-systemmonitor.inc b/recipes-plasma/plasma-systemmonitor.inc index cd4a151..edaea6a 100644 --- a/recipes-plasma/plasma-systemmonitor.inc +++ b/recipes-plasma/plasma-systemmonitor.inc @@ -25,7 +25,7 @@ DEPENDS = " \ " inherit cmake_plasma -inherit kdoctools +inherit kf6-kdoctools FILES:${PN} += " \ ${datadir}/ksysguard/sensorfaces/ \ diff --git a/recipes-support/kpeoplevcard.inc b/recipes-support/kpeoplevcard.inc index 05733b8..6655806 100644 --- a/recipes-support/kpeoplevcard.inc +++ b/recipes-support/kpeoplevcard.inc @@ -21,7 +21,7 @@ DEPENDS = " \ SRC_URI = "git://invent.kde.org/pim/${BPN};nobranch=1;protocol=https" S = "${WORKDIR}/git" -inherit kconfig -inherit kcoreaddons +inherit kf6-kconfig +inherit kf6-kcoreaddons inherit cmake_kdeapp inherit mime-xdg diff --git a/recipes-support/maliit-framework-qt5.inc b/recipes-support/maliit-framework-qt5.inc index 6619088..3148442 100644 --- a/recipes-support/maliit-framework-qt5.inc +++ b/recipes-support/maliit-framework-qt5.inc @@ -21,7 +21,7 @@ DEPENDS += " \ wayland \ " -inherit cmake_qt5 +inherit qt6-cmake inherit pkgconfig EXTRA_OECMAKE += " \ diff --git a/recipes-support/maliit-keyboard-qt5.inc b/recipes-support/maliit-keyboard-qt5.inc index b9f4fd3..86ba5ce 100644 --- a/recipes-support/maliit-keyboard-qt5.inc +++ b/recipes-support/maliit-keyboard-qt5.inc @@ -21,7 +21,7 @@ DEPENDS += " \ libchewing \ " -inherit cmake_qt5 +inherit qt6-cmake inherit gsettings inherit pkgconfig diff --git a/recipes-support/poppler/poppler_%.bbappend b/recipes-support/poppler/poppler_%.bbappend index 4dae086..7aea21c 100644 --- a/recipes-support/poppler/poppler_%.bbappend +++ b/recipes-support/poppler/poppler_%.bbappend @@ -3,4 +3,4 @@ # SPDX-License-Identifier: MIT PACKAGECONFIG:append = " qt5" -inherit cmake_qt5 +inherit qt6-cmake diff --git a/recipes-support/qtfeedback_git.bb b/recipes-support/qtfeedback_git.bb index 27359ef..145f419 100644 --- a/recipes-support/qtfeedback_git.bb +++ b/recipes-support/qtfeedback_git.bb @@ -1,4 +1,4 @@ -inherit qmake5 +inherit qt6-qmake inherit pkgconfig DEPENDS += "qtbase qtdeclarative" diff --git a/recipes-support/qtkeychain.inc b/recipes-support/qtkeychain.inc index 6c9ef29..8d4b51f 100644 --- a/recipes-support/qtkeychain.inc +++ b/recipes-support/qtkeychain.inc @@ -18,7 +18,7 @@ DEPENDS = " \ SRC_URI = "git://github.com/frankosterfeld/qtkeychain.git;nobranch=1;protocol=https" S = "${WORKDIR}/git" -inherit cmake_qt5 +inherit qt6-cmake inherit pkgconfig FILES:${PN} += " \ diff --git a/recipes-support/sddm/sddm.inc b/recipes-support/sddm/sddm.inc index 01ab2c3..b56e875 100644 --- a/recipes-support/sddm/sddm.inc +++ b/recipes-support/sddm/sddm.inc @@ -32,7 +32,7 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -inherit cmake_qt5 +inherit qt6-cmake inherit pkgconfig inherit systemd inherit useradd diff --git a/recipes-support/simplelogin.inc b/recipes-support/simplelogin.inc index 689c55b..23986ba 100644 --- a/recipes-support/simplelogin.inc +++ b/recipes-support/simplelogin.inc @@ -17,7 +17,7 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -inherit cmake_qt5 +inherit qt6-cmake inherit systemd SYSTEMD_SERVICE:${PN} = "${BPN}.service" diff --git a/recipes-support/telepathy-qt.inc b/recipes-support/telepathy-qt.inc index 1cbfc84..013b316 100644 --- a/recipes-support/telepathy-qt.inc +++ b/recipes-support/telepathy-qt.inc @@ -17,7 +17,7 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -inherit cmake_qt5 python3native +inherit qt6-cmake python3native EXTRA_OECMAKE += " -DDESIRED_QT_VERSION=5 -DENABLE_TESTS=FALSE -DENABLE_FARSTREAM=FALSE -DENABLE_EXAMPLES=FALSE"