recipes-kde: Rework dependencies on some recipes

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-01-10 17:26:51 +01:00
parent b6aa051c58
commit 790d474abb
18 changed files with 86 additions and 92 deletions
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
@@ -4,23 +4,22 @@ inherit gettext

 DEPENDS += " \
    ${BPN}-native \
-    kdoctools-native \
    kauth-native \
    sonnet-native \
+    kconfig-native kconfig \
+    kdoctools-native kdoctools \
+    kdesignerplugin-native kdesignerplugin \
+    networkmanager \
    qtsvg \
    qttools \
    kcompletion \
-    kconfig \
    kconfigwidgets \
    kcrash \
-    kdesignerplugin \
-    kdesignerplugin-native \
    kdbusaddons \
    kemoticons \
    kglobalaccel \
    kitemmodels \
    kinit \
-    kdoctools \
    kguiaddons \
    ki18n \
    kiconthemes \
--- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
+++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
@@ -9,8 +9,14 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5

-DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui kconfig-native kcoreaddons-native \
-            kauth-native"
+DEPENDS += " \
+    kcoreaddons-native \
+    kauth-native \
+    kconfig-native kconfig \
+    kconfigwidgets \
+    kiconthemes \
+    kxmlgui  \
+"

 PV = "${KF5_VERSION}"
 SRC_URI[sha256sum] = "7d9ac1b5e5b4f8102c434d7e7a503fcbce57be36db42975931aeaffe530c6ceb"
--- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
+++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
@@ -12,9 +12,17 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5

-DEPENDS += "kauth kconfig kcodecs kguiaddons kwidgetsaddons kdoctools \
-            kcoreaddons-native kauth-native kconfig-native kdoctools-native \
-            gettext-native"
+DEPENDS += " \
+    gettext-native \
+    kcoreaddons-native \
+    kdesignerplugin-native \
+    kauth-native kauth \
+    kconfig-native kconfig \
+    kdoctools-native kdoctools \
+    kcodecs \
+    kguiaddons \
+    kwidgetsaddons \
+"

 PV = "${KF5_VERSION}"
 SRC_URI[sha256sum] = "98ff947d80bd3c55bc0758b0fc9e1300078f1a9ad8a8983e737d6cd189e9a1ea"
--- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
+++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
@@ -14,9 +14,22 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5

-DEPENDS += "qtdeclarative kconfig kconfig-native ki18n kiconthemes kio kwidgetsaddons \
-            kwindowsystem kglobalaccel kguiaddons kpackage libepoxy gettext-native \
-            kcoreaddons-native kauth-native kpackage-native"
+DEPENDS += " \
+    gettext-native \
+    kcoreaddons-native \
+    kauth-native \
+    kpackage-native kpackage \
+    kconfig-native kconfig \
+    libepoxy  \
+    qtdeclarative \
+    ki18n \
+    kiconthemes \
+    kio \
+    kwidgetsaddons \
+    kwindowsystem \
+    kglobalaccel \
+    kguiaddons \
+"

 SRC_URI += " \
    file://0001-kpackagelauncherqml-Add-include-of-QDebug.patch \
--- a/recipes-kde/kf5/tier3/kinit/kinit.bb
+++ b/recipes-kde/kf5/tier3/kinit/kinit.bb
@@ -10,18 +10,16 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5 gettext

 DEPENDS += " \
-    libcap \
+    libcap-native \
+    kcoreaddons-native \
+    kauth-native \
+    kconfig kconfig-native \
+    kdoctools kdoctools-native \
    kservice \
    kio \
    ki18n \
    kwindowsystem \
    kcrash \
-    kconfig \
-    kconfig-native \
-    kcoreaddons-native \
-    kauth-native \
-    kdoctools \
-    kdoctools-native \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
 "

@@ -30,3 +28,5 @@ SRC_URI[sha256sum] = "2a3858eeb80b044e884bdc77e110e7ecb34cdb91575c544a95502123a1

 FILES:${PN} += "${datadir}/dbus-1 ${libdir}/libkdeinit5_klauncher.so"
 FILES:${PN}-dev = "${libdir}/cmake"
+
+RDEPENDS_${PN} += "libcap-bin"
--- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
+++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
@@ -13,13 +13,12 @@ inherit kde-kf5 gettext

 DEPENDS += " \
    kauth-native \
-    kconfig-native \
    kcoreaddons-native \
-    kpackage-native \
    sonnet-native \
+    kconfig-native kconfig \
+    kpackage-native kpackage \
    karchive \
    kcompletion \
-    kconfig \
    kcoreaddons \
    ki18n \
    kiconthemes \
@@ -29,7 +28,8 @@ DEPENDS += " \
    kwidgetsaddons \
    kxmlgui \
    attica \
-    kpackage \
+    kirigami2 \
+    syndication \
 "

 PV = "${KF5_VERSION}"
--- a/recipes-kde/kf5/tier3/kparts/kparts.bb
+++ b/recipes-kde/kf5/tier3/kparts/kparts.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5 gettext

 DEPENDS += " \
-    kconfig \
-    kconfig-native \
-    kcoreaddons \
-    kcoreaddons-native \
+    kauth-native \
+    kcoreaddons-native kcoreaddons \
+    kconfig-native kconfig \
    ki18n \
    kiconthemes \
    kio \
@@ -24,8 +23,6 @@ DEPENDS += " \
    ktextwidgets \
    kwidgetsaddons \
    kxmlgui \
-    kauth-native \
-    sonnet-native \
 "

 PV = "${KF5_VERSION}"
--- a/recipes-kde/kf5/tier3/krunner/krunner.bb
+++ b/recipes-kde/kf5/tier3/krunner/krunner.bb
@@ -10,10 +10,8 @@ inherit kde-kf5 gettext
 DEPENDS += " \
    qtdeclarative \
    kauth-native \
-    kconfig \
-    kconfig-native \
-    kcoreaddons \
-    kcoreaddons-native \
+    kconfig-native kconfig \
+    kcoreaddons-native kcoreaddons \
    kpackage-native \
    ki18n \
    kio \
--- a/recipes-kde/kf5/tier3/kservice/kservice.bb
+++ b/recipes-kde/kf5/tier3/kservice/kservice.bb
@@ -14,14 +14,13 @@ inherit kde-kf5 gettext

 DEPENDS += " \
    bison-native \
-    kconfig-native \
-    kdoctools-native \
+    kconfig-native kconfig \
+    kdoctools-native kdoctools \
    kcoreaddons-native \
    kconfig \
    kcrash \
    kdbusaddons \
    ki18n \
-    kdoctools \
 "

 PV = "${KF5_VERSION}"
--- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
+++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
@@ -16,8 +16,13 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5 gettext

 DEPENDS += " \
-    virtual/egl \
    gzip-native \
+    kauth-native \
+    kcoreaddons-native kcoreaddons \
+    kdoctools-native kdoctools \
+    kconfig-native kconfig \
+    kpackage-native kpackage \
+    virtual/egl \
    qtdeclarative \
    qtsvg \
    qtscript \
@@ -25,15 +30,9 @@ DEPENDS += " \
    kirigami2 \
    kactivities \
    karchive \
-    kconfig \
-    kconfig-native \
    kconfigwidgets \
-    kcoreaddons \
-    kcoreaddons-native \
    kdbusaddons \
    kdeclarative \
-    kdoctools \
-    kdoctools-native \
    kglobalaccel \
    kguiaddons \
    ki18n \
@@ -41,10 +40,7 @@ DEPENDS += " \
    kwindowsystem \
    kxmlgui \
    knotifications \
-    kpackage \
-    kpackage-native \
    kwayland \
-    kauth-native \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "

--- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
+++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
@@ -10,9 +10,9 @@ inherit kde-kf5 gettext

 DEPENDS += " \
    kauth-native \
-    kconfig \
-    kconfig-native \
    kcoreaddons-native \
+    kconfig-native kconfig \
+    kpackage-native kpackage \
    kconfigwidgets \
    ki18n \
    kiconthemes \
@@ -20,8 +20,6 @@ DEPENDS += " \
    knotifications \
    kwidgetsaddons \
    knewstuff \
-    kpackage \
-    kpackage-native \
 "

 RRECCOMENDS_${PN} += "oxygen-fonts"
--- a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb
+++ b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb
@@ -10,12 +10,11 @@ inherit kde-plasma features_check gettext

 DEPENDS += " \
    kauth-native \
-    kconfig-native \
    kcoreaddons-native \
-    kdoctools-native \
-    kdelibs4support \
-    kdoctools \
+    kconfig-native kconfig \
+    kdoctools-native kdoctools \
    virtual/libx11 \
+    kdelibs4support \
 "

 PV = "${PLASMA_VERSION}"
--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -20,21 +20,18 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma gettext

 DEPENDS += " \
+    kauth-native \
+    kpackage-native \
+    kdoctools-native kdoctools \
+    kcoreaddons-native kcoreaddons \
+    kconfig-native kconfig \
    pciutils \
    kcompletion \
-    kauth-native \
-    kconfig \
-    kconfig-native \
    kconfigwidgets \
-    kcoreaddons \
-    kcoreaddons-native \
    kdbusaddons \
-    kdoctools \
-    kdoctools-native \
    ki18n \
    kiconthemes \
    kcmutils \
-    kpackage-native \
    sonnet-native \
    kio \
    kservice \
--- a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
+++ b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
@@ -7,17 +7,11 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma gettext

 DEPENDS += " \
-    kcoreaddons \
-    kcoreaddons-native \
+    kcoreaddons-native kcoreaddons \
+    kdoctools-native kdoctools \
    ki18n \
    kwallet \
    kwidgetsaddons \
-    kdoctools-native \
-"
-
-# REVISIT optionals
-DEPENDS += " \
-    kdoctools \
 "

 PV = "${PLASMA_VERSION}"
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -24,22 +24,18 @@ DEPENDS += " \
    fontconfig \
    \
    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    kpackage-native \
+    kconfig-native kconfig \
+    kdoctools-native kdoctools \
+    kcoreaddons-native kcoreaddons \
+    kpackage-native kpackage \
    sonnet-native \
    kactivities \
-    kconfig \
    kconfigwidgets \
-    kcoreaddons \
    kcrash \
-    kdoctools \
    kglobalaccel \
    ki18n \
    kinit \
    knotifications \
-    kpackage \
    kservice \
    plasma-framework \
    kwidgetsaddons \
--- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
@@ -20,8 +20,8 @@ DEPENDS += " \
    kcoreaddons-native \
    kpackage-native \
    sonnet-native \
-    kdelibs4support-native \
-    kdoctools-native \
+    kdelibs4support-native kdelibs4support \
+    kdoctools-native kdoctools \
    kauth-native \
    kdesignerplugin-native \
    \
@@ -31,11 +31,9 @@ DEPENDS += " \
    qtdeclarative \
    \
    plasma-framework \
-    kdoctools \
    ki18n \
    kcmutils \
    knewstuff \
-    kdelibs4support \
    knotifyconfig \
    attica \
    kwallet \
--- a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
+++ b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
@@ -16,13 +16,11 @@ DEPENDS += " \
    pulseaudio \
    libcanberra \
    \
-    kcoreaddons \
-    kcoreaddons-native \
-    kconfig-native \
+    kdoctools-native kdoctools \
+    kcoreaddons-native kcoreaddons \
+    kconfig-native kconfig \
    kpackage-native \
    kdeclarative \
-    kdoctools \
-    kdoctools-native \
    kglobalaccel \
    ki18n \
    plasma-framework \
--- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
+++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma gettext

 DEPENDS += " \
-    kdoctools-native \
    sonnet-native \
    kpackage-native \
    kcoreaddons-native \
    kauth-native \
-    kconfig-native \
+    kconfig-native kconfig \
+    kdoctools-native kdoctools \
    kactivities \
    kactivities-stats \
    kirigami2 \
@@ -28,9 +28,7 @@ DEPENDS += " \
    kwindowsystem \
    kxmlgui \
    kdbusaddons \
-    kconfig \
    khtml \
-    kdoctools \
    plasma-workspace \
 "