From 1745b420aafb493d19f876b2750579ce23397c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Thu, 23 Nov 2023 16:56:43 +0100
Subject: [PATCH] xfce: Add essential apps from xfce-apps comps group

Use a filtered comps group to add essential apps instead of manually
listing them in the manifest.

Also add gparted to the image as it needs privileges thus it can't run
as a Flatpak.
---
 comps-sync-exclude-list.yml | 21 +++++++++++++++++++++
 comps-sync.py               |  2 +-
 fedora-vauxite.yaml         |  7 -------
 xfce-desktop-pkgs.yaml      |  9 +++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 683b1b8..d9e935e 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -197,6 +197,27 @@ desktop_exclude_list:
     - NetworkManager-libreswan-gnome
     - NetworkManager-sstp-gnome
     - NetworkManager-strongswan-gnome
+  xfce-apps:
+    # Non-critical apps -> Flatpak
+    - claws-mail
+    - catfish
+    - claws-mail-plugins-archive
+    - claws-mail-plugins-att-remover
+    - claws-mail-plugins-attachwarner
+    - claws-mail-plugins-fetchinfo
+    - claws-mail-plugins-mailmbox
+    - claws-mail-plugins-newmail
+    - claws-mail-plugins-notification
+    - claws-mail-plugins-pgp
+    - claws-mail-plugins-rssyl
+    - claws-mail-plugins-smime
+    - claws-mail-plugins-spam-report
+    - claws-mail-plugins-tnef
+    - claws-mail-plugins-vcalendar
+    - geany
+    - pidgin
+    - seahorse
+    - transmission
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/comps-sync.py b/comps-sync.py
index e271b9d..17a547e 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -190,7 +190,7 @@ def main():
     desktops_comps_groups = {
         "gnome": ["gnome-desktop", "base-x"],
         "kde": ["kde-desktop"],
-        "xfce": ["xfce-desktop", "base-x"],
+        "xfce": ["xfce-desktop", "xfce-apps", "base-x"],
         "lxqt": ["lxqt-desktop", "base-x"],
         "deepin": ["deepin-desktop", "base-x"],
         "mate": ["mate-desktop", "base-x"],
diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml
index 14092fc..2673e18 100644
--- a/fedora-vauxite.yaml
+++ b/fedora-vauxite.yaml
@@ -11,13 +11,6 @@ packages:
   - fedora-release-ostree-desktop
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
-  # Essential packages from @xfce-apps
-  - atril
-  - firefox
-  - galculator
-  - mousepad
-  - ristretto
-  - xarchiver
 
 repos:
   - fedora-rawhide
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index 9ab5ba0..6d7b348 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -9,10 +9,14 @@ packages:
   - Thunar
   - adwaita-gtk2-theme
   - adwaita-icon-theme
+  - atril
   - blueman
   - desktop-backgrounds-compat
+  - firefox
+  - galculator
   - glx-utils
   - gnome-keyring-pam
+  - gparted
   - greybird-dark-theme
   - greybird-light-theme
   - greybird-xfce4-notifyd-theme
@@ -26,16 +30,21 @@ packages:
   - mesa-dri-drivers
   - mesa-vulkan-drivers
   - mint-y-theme
+  - mousepad
   - network-manager-applet
   - nm-connection-editor
   - plymouth-system-theme
+  - ristretto
   - thunar-archive-plugin
   - thunar-media-tags-plugin
   - thunar-volman
+  - xarchiver
   - xdg-user-dirs-gtk
   - xfce4-about
   - xfce4-appfinder
+  - xfce4-clipman-plugin
   - xfce4-datetime-plugin
+  - xfce4-dict-plugin
   - xfce4-panel
   - xfce4-panel-profiles
   - xfce4-places-plugin