packagegroups: update due to Qt6 changes

2023-05-01 17:40:29 +02:00
parent 923d7e9276
commit 0453c292cc
3 changed files with 48 additions and 9 deletions
--- a/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb
+++ b/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb
@@ -12,11 +12,6 @@ inherit packagegroup features_check

 REQUIRED_DISTRO_FEATURES = "wayland x11 kde"

-# Qt5's WebEngine requires Python2
-WEBENGINE_PACKAGES = " \
-    aura-browser \
-    discover \
-"

 RDEPENDS:${PN} = " \
    bluedevil \
@@ -38,13 +33,15 @@ RDEPENDS:${PN} = " \
    plasma-workspace \
    polkit-kde-agent-1 \
    powerdevil \
-    plasma-settings \
    xdg-desktop-portal-kde \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'python2-layer', '${WEBENGINE_PACKAGES}', '', d)} \
 "

 RDEPENDS:${PN} += " \
    plasma-bigscreen \
    plasma-remotecontrollers \
    plank-player \
+    aura-browser \
 "
+
+# TODO currently excluded because of high appstream dependency
+# discover
--- a/recipes-integration/packagegroups/packagegroup-plasma-full.bb
+++ b/recipes-integration/packagegroups/packagegroup-plasma-full.bb
@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: 2021 Andreas Cord-Landwehr <cordlandwehr@kde.org>
+#
+# SPDX-License-Identifier: MIT
+
+DESCRIPTION = "KDE Plasma Mobile"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit packagegroup
+
+RDEPENDS:${PN} = " \
+    aura-browser \
+    kdecoration \
+    kwin \
+    plasma5support \
+    plasma-pa \
+    systemsettings \
+    bluedevil \
+    kglobalacceld \
+    layer-shell-qt \
+    plasma-bigscreen \
+    plasma-remotecontrollers \
+    xdg-desktop-portal-kde \
+    breeze \
+    kpipewire \
+    libkscreen \
+    plasma-integration \
+    plasma-systemmonitor \
+    discover \
+    kscreen \
+    libksysguard \
+    plasma-mobile \
+    plasma-workspace \
+    kactivitymanagerd \
+    kscreenlocker \
+    milou \
+    plasma-nano \
+    polkit-kde-agent-1 \
+    kde-cli-tools \
+    kwayland-integration \
+    plank-player \
+    plasma-nm \
+    powerdevil \
+"
--- a/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb
+++ b/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb
@@ -43,7 +43,5 @@ RDEPENDS:${PN} = " \
    plasma-settings \
    plasma-systemmonitor \
    xdg-desktop-portal-kde \
-    kclock \
-    kweather \
    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'python2-layer', '${WEBENGINE_PACKAGES}', '', d)} \
 "