From c10c08bb821c440bf440f9c0f886d0e6bf6e2199 Mon Sep 17 00:00:00 2001
From: madonuko <madonuko@outlook.com>
Date: Sat, 28 Sep 2024 19:51:30 +0800
Subject: [PATCH 1/3] feat(comps): include geary in gnome edition

---
 comps.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/comps.xml b/comps.xml
index 3ac914c..3139bc6 100644
--- a/comps.xml
+++ b/comps.xml
@@ -130,6 +130,7 @@
       <packagereq type="default">ultramarine-release-gnome</packagereq>
       <packagereq type="optional">ultramarine-release-identity-gnome</packagereq>
       <packagereq type="default">gs-plugin-ultramarine-pkgdb-collections</packagereq>
+      <packagereq type="default">geary</packagereq>
     </packagelist>
   </group>
   <environment>

From d0d25f2a334b48e706671ce085e82b257336a3b2 Mon Sep 17 00:00:00 2001
From: madonuko <madonuko@outlook.com>
Date: Sun, 29 Sep 2024 16:49:00 +0800
Subject: [PATCH 2/3] feat(comps): use ptyxis,evince instead of
 gnome-terminal,atril

---
 comps.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/comps.xml b/comps.xml
index 3139bc6..02b60aa 100644
--- a/comps.xml
+++ b/comps.xml
@@ -77,7 +77,7 @@
       <packagereq type="default">nemo-emblems</packagereq>
       <packagereq type="default">helium-gtk-theme</packagereq>
       <packagereq type="default">hydrogen-icon-theme</packagereq>
-      <packagereq type="default">gnome-terminal</packagereq>
+      <packagereq type="default">ptyxis</packagereq>
       <packagereq type="default">seahorse</packagereq>
       <packagereq type="default">gnome-system-monitor</packagereq>
       <packagereq type="default">gnome-calculator</packagereq>
@@ -234,7 +234,7 @@
       <packagereq type="default">ultramarine-backgrounds-common</packagereq>
       <packagereq type="default">seahorse</packagereq>
       <packagereq type="default">gnome-software</packagereq>
-      <packagereq type="default">atril</packagereq>
+      <packagereq type="default">evince</packagereq>
       <packagereq type="default">catfish</packagereq>
       <packagereq type="default">geary</packagereq>
       <packagereq type="default">firefox</packagereq>

From 78bffb002076a18b896c20a1ff9daf50fbd4ab60 Mon Sep 17 00:00:00 2001
From: madonuko <madonuko@outlook.com>
Date: Sun, 29 Sep 2024 17:02:55 +0800
Subject: [PATCH 3/3] fix(comps): remove @sound-and-video (and @input-method
 from plasma)

---
 comps.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/comps.xml b/comps.xml
index 02b60aa..b0ae61a 100644
--- a/comps.xml
+++ b/comps.xml
@@ -104,7 +104,7 @@
       <groupid>hardware-support</groupid>
       <groupid>libreoffice</groupid>
       <groupid>multimedia</groupid>
-      <groupid>sound-and-video</groupid>
+      <!-- <groupid>sound-and-video</groupid> -->
       <groupid>networkmanager-submodules</groupid>
       <groupid>printing</groupid>
       <groupid>desktop-accessibility</groupid>
@@ -149,7 +149,7 @@
       <groupid>hardware-support</groupid>
       <groupid>libreoffice</groupid>
       <groupid>multimedia</groupid>
-      <groupid>sound-and-video</groupid>
+      <!-- <groupid>sound-and-video</groupid> -->
       <groupid>networkmanager-submodules</groupid>
       <groupid>printing</groupid>
       <groupid>desktop-accessibility</groupid>
@@ -181,8 +181,8 @@
       <packagereq type="default">kolourpaint</packagereq>
       <packagereq type="default">kate</packagereq>
       <packagereq type="default">kmail</packagereq>
-      <packagereq type="default">vlc</packagereq>
-      <packagereq type="default">kalk</packagereq>
+      <packagereq type="default">haruna</packagereq>
+      <packagereq type="default">kcalc</packagereq>
     </packagelist>
   </group>
   <environment>
@@ -202,11 +202,12 @@
       <groupid>hardware-support</groupid>
       <groupid>libreoffice</groupid>
       <groupid>multimedia</groupid>
-      <groupid>sound-and-video</groupid>
+      <!-- <groupid>sound-and-video</groupid> -->
       <groupid>networkmanager-submodules</groupid>
       <groupid>printing</groupid>
       <groupid>desktop-accessibility</groupid>
-      <groupid>input-methods</groupid>
+      <!-- <groupid>input-methods</groupid> -->
+      <!-- We should use fcitx5 in plasma instead -->
       <groupid>ultramarine-product-common</groupid>
       <groupid>ultramarine-desktop-product-common</groupid>
       <groupid>ultramarine-plasma-product</groupid>
@@ -265,7 +266,7 @@
       <groupid>hardware-support</groupid>
       <groupid>libreoffice</groupid>
       <groupid>multimedia</groupid>
-      <groupid>sound-and-video</groupid>
+      <!-- <groupid>sound-and-video</groupid> -->
       <groupid>networkmanager-submodules</groupid>
       <groupid>printing</groupid>
       <groupid>desktop-accessibility</groupid>