From f1d0b216093486a913d1c01a0c16cc27e5d19ac2 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 22 2025 23:50:50 +0000
Subject: [PATCH 1/2] comps-sync-exclude-list: Exclude git-core


We have git-core explicitly added in the common manifest.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 3e69301..6d39eac 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -214,6 +214,8 @@ desktop_exclude_list:
   swaywm-extended:
     # Non-critical apps -> Flatpak
     - mpv
+    # Explicitly added in common.yaml
+    - git-core
   cosmic-desktop-apps:
     # Non-critical apps -> Flatpak
     - gnome-calculator
diff --git a/packages/sway-atomic.yaml b/packages/sway-atomic.yaml
index 6e5d8cf..f29d42f 100644
--- a/packages/sway-atomic.yaml
+++ b/packages/sway-atomic.yaml
@@ -12,7 +12,6 @@ packages:
   - dunst
   - foot
   - fprintd-pam
-  - git-core
   - gnome-keyring-pam
   - grim
   - gvfs

From 886d93d33a0cb5e5f95b6d9e10e5e9b8a8aed417 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 22 2025 23:50:50 +0000
Subject: [PATCH 2/2] fedora: Move toolbox to the Fedora specific manifest


Some downstream want to use alternative implementations instead of
toolbox. Move it to the Fedora specific manifest to make that easier.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 6d39eac..f0b957a 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -105,6 +105,8 @@ exclude_list:
     - fedora-workstation-repositories
     # See: https://gitlab.com/fedora/ostree/sig/-/issues/81
     - plocate
+    # Included explicitly in the fedora.yaml manifest
+    - toolbox
   firefox:
     # Included explicitly in the fedora.yaml manifest
     - fedora-bookmarks
@@ -216,6 +218,9 @@ desktop_exclude_list:
     - mpv
     # Explicitly added in common.yaml
     - git-core
+  cosmic-desktop:
+    # Included explicitly in the fedora.yaml manifest
+    - toolbox
   cosmic-desktop-apps:
     # Non-critical apps -> Flatpak
     - gnome-calculator
diff --git a/fedora.yaml b/fedora.yaml
index 082e6c7..1d4a1c9 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -17,6 +17,8 @@ packages:
   # See: https://gitlab.com/fedora/ostree/sig/-/issues/50
   - fuse
   - fuse-libs
+  # Allow downstreams to use an alternative
+  - toolbox
 
 # Fedora specific packages for each variant
 conditional-include:
diff --git a/packages/common.yaml b/packages/common.yaml
index 43ef6c8..c1f1369 100644
--- a/packages/common.yaml
+++ b/packages/common.yaml
@@ -167,7 +167,6 @@ packages:
   - tar
   - time
   - tiwilink-firmware
-  - toolbox
   - tree
   - unzip
   - uresourced
diff --git a/packages/cosmic-atomic.yaml b/packages/cosmic-atomic.yaml
index f004e19..a60b1a7 100644
--- a/packages/cosmic-atomic.yaml
+++ b/packages/cosmic-atomic.yaml
@@ -15,4 +15,3 @@ packages:
   - mesa-dri-drivers
   - mesa-vulkan-drivers
   - plymouth-system-theme
-  - toolbox