From 0453c292ccc7c5597feab3bee7d5852e4afb3a2d Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Mon, 1 May 2023 17:40:29 +0200
Subject: [PATCH] packagegroups: update due to Qt6 changes

---
 ...packagegroup-plasma-bigscreen-workspace.bb | 11 ++---
 .../packagegroups/packagegroup-plasma-full.bb | 44 +++++++++++++++++++
 .../packagegroup-plasma-mobile-workspace.bb   |  2 -
 3 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 recipes-integration/packagegroups/packagegroup-plasma-full.bb

diff --git a/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb b/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb
index a66c74d..927bf66 100644
--- 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
diff --git a/recipes-integration/packagegroups/packagegroup-plasma-full.bb b/recipes-integration/packagegroups/packagegroup-plasma-full.bb
new file mode 100644
index 0000000..b51cab3
--- /dev/null
+++ 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 \
+"
diff --git a/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb b/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb
index f9935a1..3848c34 100644
--- 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)} \
 "