From 6901df28087794e2fbec1bcd976fd4220db0001d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 15 2022 16:09:51 +0000
Subject: [PATCH 1/3] Remove Pantheon (removed from Fedora)


---

diff --git a/comps-sync.py b/comps-sync.py
index b63e533..54d3040 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -132,7 +132,7 @@ if (n_manifest_new > 0 or n_comps_new > 0) and args.save:
 
 # Generate treefiles for all desktops
 for desktop in [ 'gnome-desktop', 'kde-desktop', 'xfce-desktop',
-        'lxqt-desktop', 'deepin-desktop', 'pantheon-desktop', 'mate-desktop']:
+        'lxqt-desktop', 'deepin-desktop', 'mate-desktop']:
     print()
     print("Syncing packages for {}:".format(desktop))
 
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
deleted file mode 100644
index b61aa3f..0000000
--- a/fedora-pantheon.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-include: pantheon-desktop-pkgs.yaml
-ref: fedora/rawhide/${basearch}/pantheon
-rojig:
-  name: fedora-pantheon
-  summary: "Fedora Pantheon base image"
-  license: MIT
-packages:
-  # Generic release package for desktop variants
-  - fedora-release
-  - fedora-release-ostree-desktop
-
-repos:
-  - fedora-rawhide
-  # - fedora-38
-  # - fedora-38-updates
diff --git a/pantheon-desktop-pkgs.yaml b/pantheon-desktop-pkgs.yaml
deleted file mode 100644
index cc4df6e..0000000
--- a/pantheon-desktop-pkgs.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# DO NOT EDIT! This content is generated from comps-sync.py
-include: fedora-common-ostree.yaml
-packages:
-  - contractor
-  - elementary-calculator
-  - elementary-calendar
-  - elementary-camera
-  - elementary-capnet-assist
-  - elementary-code
-  - elementary-files
-  - elementary-greeter
-  - elementary-icon-theme
-  - elementary-music
-  - elementary-notifications
-  - elementary-photos
-  - elementary-print
-  - elementary-screenshot-tool
-  - elementary-shortcut-overlay
-  - elementary-sideload
-  - elementary-sound-theme
-  - elementary-terminal
-  - elementary-theme
-  - elementary-videos
-  - elementary-wallpapers
-  - gala
-  - gnome-session
-  - pantheon-agent-geoclue2
-  - pantheon-agent-polkit
-  - pantheon-session-settings
-  - plank
-  - switchboard
-  - switchboard-plug-a11y
-  - switchboard-plug-about
-  - switchboard-plug-applications
-  - switchboard-plug-bluetooth
-  - switchboard-plug-display
-  - switchboard-plug-keyboard
-  - switchboard-plug-mouse-touchpad
-  - switchboard-plug-networking
-  - switchboard-plug-notifications
-  - switchboard-plug-pantheon-shell
-  - switchboard-plug-printers
-  - switchboard-plug-sharing
-  - switchboard-plug-sound
-  - wingpanel
-  - wingpanel-applications-menu
-  - wingpanel-indicator-bluetooth
-  - wingpanel-indicator-datetime
-  - wingpanel-indicator-keyboard
-  - wingpanel-indicator-network
-  - wingpanel-indicator-nightlight
-  - wingpanel-indicator-notifications
-  - wingpanel-indicator-power
-  - wingpanel-indicator-session
-  - wingpanel-indicator-sound

From 77819a77c0240ab8b83af42ebdf8da3f451598fd Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 15 2022 16:09:51 +0000
Subject: [PATCH 2/3] Revert "Kinoite: Manually include imsettings-systemd"


This reverts commit 663cf9dac0bff235f67d0f8e3aae429d83281764.

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index ebeb8a2..ec60103 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -15,8 +15,6 @@ packages:
   - xdg-desktop-portal-kde
   # Provide an archive manager by default
   - ark
-  # Manually add missing packages for missing input-methods
-  - imsettings-systemd
 
 # Make sure the following are not pulled in when Recommended by other packages
 exclude-packages:

From 392cf036a08dbddb05fb7bf3a8419f1dccd147f6 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 15 2022 16:09:51 +0000
Subject: [PATCH 3/3] Kinoite: Keep some application until with get Flatpaks


Keep some basic application in the base image until we can replace them
with Flatpaks.

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index ec60103..8572e75 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -15,6 +15,12 @@ packages:
   - xdg-desktop-portal-kde
   # Provide an archive manager by default
   - ark
+  # Keep some basic apps installed until we have Flatpaks available
+  # See https://pagure.io/fedora-kde/SIG/issue/13
+  - gwenview
+  - kcalc
+  - kwrite
+  - okular
 
 # Make sure the following are not pulled in when Recommended by other packages
 exclude-packages:

