From af3fb7dc1eee471fed77ec6e6f6f8d83bf6d5483 Mon Sep 17 00:00:00 2001
From: madomado <madonuko@outlook.com>
Date: Thu, 12 Dec 2024 19:57:28 +0800
Subject: [PATCH 1/2] fix(comps): xml

---
 comps.xml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/comps.xml b/comps.xml
index 1a1f435..e0183f9 100644
--- a/comps.xml
+++ b/comps.xml
@@ -91,7 +91,7 @@
       <packagereq type="default">nemo-python</packagereq>
       <packagereq type="default">nemo-preview</packagereq>
       <packagereq type="default">nemo-emblems</packagereq>
-      <packagereq type="default">fluent-gtk-theme</packagereq>
+      <packagereq type="default">fluent-theme</packagereq>
       <packagereq type="default">fluent-icon-theme</packagereq>
       <packagereq type="default">ptyxis</packagereq>
       <packagereq type="default">gnome-system-monitor</packagereq>
@@ -101,22 +101,24 @@
       <packagereq type="default">xdg-desktop-portal-gtk</packagereq>
     </packagelist>
   </group>
-  <id>ultramarine-flagship-apps</id>
-  <_name>Ultramarine Flagship Applications</_name>
-  <_description>Apps included with Ultramarine Flagship</_description>
-  <packagelist>
-    <packagereq type="default">eog</packagereq>
-    <packagereq type="default">firefox</packagereq>
-    <packagereq type="default">gedit</packagereq>
-    <!-- <packagereq type="default">gnome-calculator</packagereq> flatpak'd -->
-    <packagereq type="default">gnome-disk-utility</packagereq>
-    <packagereq type="default">gnome-system-monitor</packagereq>
-    <packagereq type="default">nemo</packagereq>
-    <packagereq type="default">nemo-fileroller</packagereq>
-    <packagereq type="default">nemo-seahorse</packagereq>
-    <packagereq type="default">parole</packagereq>
-    <packagereq type="default">seahorse</packagereq>
-  </packagelist>
+  <group>
+    <id>ultramarine-flagship-apps</id>
+    <name>Ultramarine Flagship Applications</name>
+    <description>Apps included with Ultramarine Flagship</description>
+    <packagelist>
+      <packagereq type="default">eog</packagereq>
+      <packagereq type="default">firefox</packagereq>
+      <packagereq type="default">gedit</packagereq>
+      <!-- <packagereq type="default">gnome-calculator</packagereq> flatpak'd -->
+      <packagereq type="default">gnome-disk-utility</packagereq>
+      <packagereq type="default">gnome-system-monitor</packagereq>
+      <packagereq type="default">nemo</packagereq>
+      <packagereq type="default">nemo-fileroller</packagereq>
+      <packagereq type="default">nemo-seahorse</packagereq>
+      <packagereq type="default">parole</packagereq>
+      <packagereq type="default">seahorse</packagereq>
+    </packagelist>
+  </group>
   <environment>
     <id>ultramarine-flagship-product-environment</id>
     <name>Ultramarine Flagship</name>

From bb1b28580109735013bc1366de67c7fff62c7409 Mon Sep 17 00:00:00 2001
From: madomado <madonuko@outlook.com>
Date: Thu, 12 Dec 2024 20:49:16 +0800
Subject: [PATCH 2/2] fix(comps): rm ultramarine-xfce-filesystem as it doesn't
 exist

---
 comps.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/comps.xml b/comps.xml
index e0183f9..deccee1 100644
--- a/comps.xml
+++ b/comps.xml
@@ -375,7 +375,6 @@
     <packagelist>
       <packagereq type="mandatory">ultramarine-release-xfce</packagereq>
       <packagereq type="optional">ultramarine-release-identity-xfce</packagereq>
-      <packagereq type="mandatory">ultramarine-xfce-filesystem</packagereq>
       <packagereq type="mandatory">lightdm-gtk</packagereq>
       <packagereq type="default">xfce4-whiskermenu-plugin</packagereq>
       <packagereq type="default">xfce4-docklike-plugin</packagereq>