From 8519fd7a78c87938762ccf1dd447de1053855ba3 Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Sun, 23 Jul 2023 13:08:22 +0200
Subject: [PATCH] packagegroup-plasma-*-workspace: refactor packagegroups

Introduce specific packagegroups for all three currently supported
flavors of the Plasma workspace.
---
 ...packagegroup-plasma-bigscreen-workspace.bb | 27 +-----------------
 .../packagegroup-plasma-desktop-workspace.bb  | 16 +++++++++++
 .../packagegroup-plasma-mobile-workspace.bb   | 25 +----------------
 .../packagegroups/plasma-workspace-common.inc | 28 +++++++++++++++++++
 4 files changed, 46 insertions(+), 50 deletions(-)
 create mode 100644 recipes-integration/packagegroups/packagegroup-plasma-desktop-workspace.bb
 create mode 100644 recipes-integration/packagegroups/plasma-workspace-common.inc

diff --git a/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb b/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb
index f290517..698589e 100644
--- a/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb
+++ b/recipes-integration/packagegroups/packagegroup-plasma-bigscreen-workspace.bb
@@ -9,32 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland x11 kde"
-
-
-RDEPENDS:${PN} = " \
-    bluedevil \
-    breeze \
-    kactivitymanagerd \
-    kde-cli-tools \
-    kdecoration \
-    kscreen \
-    kscreenlocker \
-    kwayland-integration \
-    kwin \
-    libkscreen \
-    libksysguard \
-    milou \
-    plasma-integration \
-    plasma-nano \
-    plasma-nm \
-    plasma-pa \
-    plasma-workspace \
-    polkit-kde-agent-1 \
-    powerdevil \
-    xdg-desktop-portal-kde \
-"
+require plasma-workspace-common.inc
 
 RDEPENDS:${PN} += " \
     plasma-bigscreen \
diff --git a/recipes-integration/packagegroups/packagegroup-plasma-desktop-workspace.bb b/recipes-integration/packagegroups/packagegroup-plasma-desktop-workspace.bb
new file mode 100644
index 0000000..7a7cd6c
--- /dev/null
+++ b/recipes-integration/packagegroups/packagegroup-plasma-desktop-workspace.bb
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: 2023 Andreas Cord-Landwehr <cordlandwehr@kde.org>
+#
+# SPDX-License-Identifier: MIT
+
+SUMMARY = "KDE Plasma Desktop"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup features_check
+require plasma-workspace-common.inc
+
+RDEPENDS:${PN} += " \
+    plasma-desktop \
+"
diff --git a/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb b/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb
index 3848c34..b244989 100644
--- a/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb
+++ b/recipes-integration/packagegroups/packagegroup-plasma-mobile-workspace.bb
@@ -11,8 +11,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland x11 kde"
+require plasma-workspace-common.inc
 
 # Qt5's WebEngine requires Python2
 WEBENGINE_PACKAGES = " \
@@ -20,28 +19,6 @@ WEBENGINE_PACKAGES = " \
 "
 
 RDEPENDS:${PN} = " \
-    bluedevil \
-    breeze \
-    kactivitymanagerd \
-    kde-cli-tools \
-    kdecoration \
-    kscreen \
-    kscreenlocker \
-    kwayland-integration \
-    kwin \
-    libkscreen \
-    libksysguard \
-    milou \
-    plasma-integration \
-    plasma-nano \
-    plasma-nm \
-    plasma-pa \
     plasma-mobile \
-    plasma-workspace \
-    polkit-kde-agent-1 \
-    powerdevil \
-    plasma-settings \
-    plasma-systemmonitor \
-    xdg-desktop-portal-kde \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'python2-layer', '${WEBENGINE_PACKAGES}', '', d)} \
 "
diff --git a/recipes-integration/packagegroups/plasma-workspace-common.inc b/recipes-integration/packagegroups/plasma-workspace-common.inc
new file mode 100644
index 0000000..e461bae
--- /dev/null
+++ b/recipes-integration/packagegroups/plasma-workspace-common.inc
@@ -0,0 +1,28 @@
+# SPDX-FileCopyrightText: 2023 Andreas Cord-Landwehr <cordlandwehr@kde.org>
+#
+# SPDX-License-Identifier: MIT
+
+REQUIRED_DISTRO_FEATURES = "wayland kde"
+
+RDEPENDS:${PN} += " \
+    bluedevil \
+    breeze \
+    kactivitymanagerd \
+    kde-cli-tools \
+    kdecoration \
+    kscreen \
+    kscreenlocker \
+    kwayland-integration \
+    kwin \
+    libkscreen \
+    libksysguard \
+    milou \
+    plasma-integration \
+    plasma-nano \
+    plasma-nm \
+    plasma-pa \
+    plasma-workspace \
+    polkit-kde-agent-1 \
+    powerdevil \
+    xdg-desktop-portal-kde \
+"