From 790d474abbf7dc70176efd614ba0f06921f072ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 10 Jan 2022 17:26:51 +0100 Subject: [PATCH] recipes-kde: Rework dependencies on some recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../kdelibs4support/kdelibs4support.bb | 9 ++++----- .../kf5/tier3/kbookmarks/kbookmarks.bb | 10 ++++++++-- .../tier3/kconfigwidgets/kconfigwidgets.bb | 14 +++++++++++--- .../kf5/tier3/kdeclarative/kdeclarative.bb | 19 ++++++++++++++++--- recipes-kde/kf5/tier3/kinit/kinit.bb | 14 +++++++------- recipes-kde/kf5/tier3/knewstuff/knewstuff.bb | 8 ++++---- recipes-kde/kf5/tier3/kparts/kparts.bb | 9 +++------ recipes-kde/kf5/tier3/krunner/krunner.bb | 6 ++---- recipes-kde/kf5/tier3/kservice/kservice.bb | 5 ++--- .../plasma-framework/plasma-framework.bb | 16 ++++++---------- .../frameworkintegration.bb | 6 ++---- recipes-kde/plasma/untier/kgamma5/kgamma5.bb | 7 +++---- .../plasma/untier/kinfocenter/kinfocenter.bb | 13 +++++-------- .../plasma/untier/ksshaskpass/ksshaskpass.bb | 10 ++-------- recipes-kde/plasma/untier/kwin/kwin.bb | 12 ++++-------- .../untier/plasma-desktop/plasma-desktop.bb | 6 ++---- .../plasma/untier/plasma-pa/plasma-pa.bb | 8 +++----- .../untier/systemsettings/systemsettings.bb | 6 ++---- 18 files changed, 86 insertions(+), 92 deletions(-) diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb index 3559e168..a8898e7f 100644 --- 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 \ diff --git a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb index fb131e01..f0f99a1b 100644 --- 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" diff --git a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb index 4f4c172c..895a669c 100644 --- 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" diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb index 4aade60e..709f128b 100644 --- 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 \ diff --git a/recipes-kde/kf5/tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb index 267e5b51..f8de7805 100644 --- 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" diff --git a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb index 63ff83e2..9093c312 100644 --- 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}" diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb index 5acd8c87..d3508a12 100644 --- 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}" diff --git a/recipes-kde/kf5/tier3/krunner/krunner.bb b/recipes-kde/kf5/tier3/krunner/krunner.bb index b7d20387..80d355b6 100644 --- 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 \ diff --git a/recipes-kde/kf5/tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb index c02a9775..1cde3a4e 100644 --- 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}" diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb index 5c06f980..36d7cca4 100644 --- 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)} \ " diff --git a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb index 6d65738b..1e1d5361 100644 --- 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" diff --git a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb index 348eff57..1854701d 100644 --- 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}" diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb index 0675d85e..8dfec424 100644 --- 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 \ diff --git a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb index 4cc16e3d..9c7ba11a 100644 --- 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}" diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb index 2fde97f3..13b981b7 100644 --- 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 \ diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb index e73ddf8c..b5364605 100644 --- 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 \ diff --git a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb index 7ada04c2..a56e3191 100644 --- 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 \ diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb index 479f03ba..f44284b6 100644 --- 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 \ "