From 55235c7d3a85272105ed2bcae02b705697873760 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 20 2025 17:05:19 +0000 Subject: manifests: Remove cinnamon, lxqt, mate & xfce variants I added those variants a while back but they did not find a maintainer to turn them into official ones. They can be re-introduced if someone steps up to maintain them. --- diff --git a/cinnamon-atomic-packages.yaml b/cinnamon-atomic-packages.yaml deleted file mode 100644 index b81a77d..0000000 --- a/cinnamon-atomic-packages.yaml +++ /dev/null @@ -1,63 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-adsl - - NetworkManager-bluetooth - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-vpnc-gnome - - NetworkManager-wifi - - NetworkManager-wwan - - blueman - - cinnamon - - cinnamon-control-center - - cinnamon-screensaver - - ffmpegthumbnailer - - firefox - - firewall-config - - glx-utils - - gnome-disk-utility - - gnome-screenshot - - gnome-system-monitor - - gnome-terminal - - gstreamer1-plugins-ugly-free - - gvfs-archive - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-smb - - imsettings-gsettings - - initial-setup-gui - - mesa-dri-drivers - - mesa-vulkan-drivers - - metacity - - nemo-fileroller - - nemo-image-converter - - nemo-preview - - nm-connection-editor - - pipewire-alsa - - pipewire-pulseaudio - - pluma - - plymouth-system-theme - - powerline - - qadwaitadecorations-qt5 - - setroubleshoot - - slick-greeter - - slick-greeter-cinnamon - - system-config-printer - - wireplumber - - xawtv - - xdg-user-dirs-gtk - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vmware diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml deleted file mode 100644 index 06cbe89..0000000 --- a/cinnamon-atomic.yaml +++ /dev/null @@ -1,24 +0,0 @@ -variables: - variant: "cinnamon-atomic" - -include: - - common.yaml - - cinnamon-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/cinnamon -rojig: - name: fedora-cinnamon - summary: "Fedora Cinnamon Atomic" - license: MIT - -packages: - # Portals for Flatpak - - xdg-desktop-portal-gtk - # Include GUI to manage updates & Flatpaks - - gnome-software - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-44 - # - fedora-44-updates diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index f0ee872..31e61cc 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -190,120 +190,9 @@ desktop_exclude_list: kde-mobile: # Already included by default for all variants - glibc-all-langpacks - xfce-desktop: - # Incompatible with ostree for various reasons - - abrt-desktop - - dnfdragora-updater - # Non-critical apps -> Flatpak - - fros-recordmydesktop - - tumbler - # Misc - - alsa-utils - - firewall-config - - openssh-askpass - - vim-enhanced - # Remove uncommon NetworkManager plugins - - NetworkManager-fortisslvpn-gnome - - NetworkManager-iodine-gnome - - NetworkManager-l2tp-gnome - - 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 - # X11 is going away with Plasma 6 - - sddm-x11 - mate-desktop: - # Incompatible with ostree for various reasons - - abrt-desktop - - abrt-java-connector - - dnfdragora-updater - # Non-critical apps -> Flatpak - - blivet-gui - - filezilla - - gnome-disk-utility - - gnome-logs - - gnote - - gparted - - hexchat - - p7zip - - p7zip-plugins - - simple-scan - - thunderbird - - transmission-gtk - - vim-enhanced - - xfburn - - yelp - # Non critical NetworkManager plugins - - NetworkManager-iodine-gnome - - NetworkManager-l2tp-gnome - - NetworkManager-libreswan-gnome - - NetworkManager-ovs - - NetworkManager-sstp-gnome - - NetworkManager-strongswan-gnome - - NetworkManager-team - # Already in the common set - - wireplumber swaywm-extended: # Non-critical apps -> Flatpak - mpv - cinnamon-desktop: - # Incompatible with ostree for various reasons - - abrt-desktop - - abrt-java-connector - - dnfdragora-updater - # Will switch to Silverblue on rebases - - gnome-software - # Non-critical apps -> Flatpak & toolbox - - eom - - gnome-calculator - - gucharmap - - hexchat - - mpv - - pidgin - - sane-backends-drivers-scanners - - shotwell - - simple-scan - - thunderbird - - tmux - - tmux-powerline - - transmission - - vim-powerline - - xed - - xfburn - - xreader - # Not default to cinnamon - - paper-icon-theme - # Non critical NetworkManager plugins - - NetworkManager-iodine-gnome - - NetworkManager-l2tp-gnome - - NetworkManager-libreswan-gnome - - NetworkManager-ovs - - NetworkManager-sstp-gnome - - NetworkManager-strongswan-gnome - - NetworkManager-team cosmic-desktop-apps: # Non-critical apps -> Flatpak - gnome-calculator diff --git a/comps-sync.py b/comps-sync.py index d584867..9dc7213 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -194,15 +194,11 @@ def main(): # List of comps groups used for each variant variant_comps_groups = { "budgie-atomic": ["budgie-desktop", "budgie-desktop-apps", "base-x"], - "cinnamon-atomic": ["cinnamon-desktop", "base-x"], "cosmic-atomic": ["cosmic-desktop", "cosmic-desktop-apps", "base-graphical"], "kinoite": ["kde-desktop", "base-graphical"], "kinoite-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"], - "lxqt-atomic": ["lxqt-desktop", "base-graphical"], - "mate-atomic": ["mate-desktop", "base-x"], "silverblue": ["gnome-desktop", "base-graphical"], "sway-atomic": ["swaywm", "swaywm-extended", "base-graphical"], - "xfce-atomic": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"], } # Generate treefiles for all variants diff --git a/lxqt-atomic-packages.yaml b/lxqt-atomic-packages.yaml deleted file mode 100644 index ef090ba..0000000 --- a/lxqt-atomic-packages.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - breeze-cursor-theme - - breeze-gtk - - breeze-icon-theme - - falkon - - firewall-config - - initial-setup-gui - - lxqt-about - - lxqt-archiver - - lxqt-config - - lxqt-globalkeys - - lxqt-notificationd - - lxqt-openssh-askpass - - lxqt-panel - - lxqt-policykit - - lxqt-powermanagement - - lxqt-qtplugin - - lxqt-runner - - lxqt-session - - lxqt-themes - - lxqt-themes-fedora - - lxqt-wayland-session-default-compositor-miriway - - mesa-dri-drivers - - mesa-vulkan-drivers - - network-manager-applet - - nm-connection-editor - - notification-daemon - - obconf - - openbox - - pcmanfm-qt - - perl-File-MimeInfo - - plymouth-system-theme - - qterminal - - sddm - - sddm-themes - - sddm-wayland-miriway - - upower - - xdg-user-dirs diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml deleted file mode 100644 index cee835f..0000000 --- a/lxqt-atomic.yaml +++ /dev/null @@ -1,30 +0,0 @@ -variables: - variant: "lxqt-atomic" - exclude_perl: false - -include: - - common.yaml - - lxqt-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/lazurite -rojig: - name: fedora-lxqt - summary: "Fedora LXQt Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - - libqtxdg - - kvantum - - kwin-wayland - - plasma-systemsettings - # Portals for Flatpak - - xdg-desktop-portal-kde - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-44 - # - fedora-44-updates diff --git a/mate-atomic-packages.yaml b/mate-atomic-packages.yaml deleted file mode 100644 index 4251435..0000000 --- a/mate-atomic-packages.yaml +++ /dev/null @@ -1,116 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-adsl - - NetworkManager-bluetooth - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wifi - - NetworkManager-wwan - - atril - - atril-caja - - atril-thumbnailer - - blueman - - caja - - caja-actions - - caja-image-converter - - caja-open-terminal - - caja-sendto - - caja-wallpaper - - caja-xattr-tags - - dconf-editor - - engrampa - - eom - - f38-backgrounds-base - - f38-backgrounds-extras-base - - f38-backgrounds-extras-mate - - f38-backgrounds-mate - - fedora-release-matecompiz - - firefox - - firewall-config - - glx-utils - - gnome-epub-thumbnailer - - gnome-themes-extra - - gstreamer1-plugins-ugly-free - - gtk2-engines - - gucharmap - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - initial-setup-gui - - libmatekbd - - libmatemixer - - libmateweather - - libsecret - - lightdm - - lm_sensors - - marco - - mate-applets - - mate-backgrounds - - mate-calc - - mate-control-center - - mate-desktop - - mate-dictionary - - mate-disk-usage-analyzer - - mate-icon-theme - - mate-media - - mate-menus - - mate-menus-preferences-category-menu - - mate-notification-daemon - - mate-panel - - mate-polkit - - mate-power-manager - - mate-screensaver - - mate-screenshot - - mate-search-tool - - mate-session-manager - - mate-settings-daemon - - mate-system-log - - mate-system-monitor - - mate-terminal - - mate-themes - - mate-user-admin - - mate-user-guide - - mesa-dri-drivers - - mesa-vulkan-drivers - - mozo - - network-manager-applet - - nm-connection-editor - - parole - - pavucontrol - - pipewire-alsa - - pipewire-pulseaudio - - pluma - - plymouth-system-theme - - seahorse - - seahorse-caja - - setroubleshoot - - slick-greeter-mate - - system-config-language - - system-config-printer - - system-config-printer-applet - - usermode-gtk - - xdg-user-dirs-gtk - - xmodmap - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit - - xrdb -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vmware diff --git a/mate-atomic.yaml b/mate-atomic.yaml deleted file mode 100644 index 7af4a04..0000000 --- a/mate-atomic.yaml +++ /dev/null @@ -1,27 +0,0 @@ -variables: - variant: "mate-atomic" - -include: - - common.yaml - - mate-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/mate -rojig: - name: fedora-mate - summary: "Fedora Mate Atomic" - license: MIT - -packages: - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - -exclude-packages: - - python3-unbound - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-44 - # - fedora-44-updates diff --git a/xfce-atomic-packages.yaml b/xfce-atomic-packages.yaml deleted file mode 100644 index e72e577..0000000 --- a/xfce-atomic-packages.yaml +++ /dev/null @@ -1,92 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - 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 - - greybird-xfwm4-theme - - gtk-xfce-engine - - gvfs - - gvfs-archive - - gvfs-mtp - - initial-setup-gui - - lightdm-gtk - - 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-battery-plugin - - xfce4-clipman-plugin - - xfce4-cpugraph-plugin - - xfce4-datetime-plugin - - xfce4-dict-plugin - - xfce4-diskperf-plugin - - xfce4-eyes-plugin - - xfce4-fsguard-plugin - - xfce4-genmon-plugin - - xfce4-mailwatch-plugin - - xfce4-mount-plugin - - xfce4-netload-plugin - - xfce4-panel - - xfce4-panel-profiles - - xfce4-places-plugin - - xfce4-power-manager - - xfce4-pulseaudio-plugin - - xfce4-screensaver - - xfce4-screenshooter-plugin - - xfce4-sensors-plugin - - xfce4-session - - xfce4-settings - - xfce4-systemload-plugin - - xfce4-taskmanager - - xfce4-terminal - - xfce4-time-out-plugin - - xfce4-verve-plugin - - xfce4-weather-plugin - - xfce4-whiskermenu-plugin - - xfce4-xkb-plugin - - xfconf - - xfdashboard - - xfdashboard-themes - - xfdesktop - - xfwm4 - - xfwm4-themes - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vmware diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml deleted file mode 100644 index 6b6bcc9..0000000 --- a/xfce-atomic.yaml +++ /dev/null @@ -1,26 +0,0 @@ -variables: - variant: "xfce-atomic" - exclude_perl: false - -include: - - common.yaml - - xfce-atomic-packages.yaml - -ref: fedora/rawhide/${basearch}/vauxite -rojig: - name: fedora-vauxite - summary: "Fedora XFCE Atomic" - license: MIT - -packages: - - fedora-release-xfce - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-44 - # - fedora-44-updates