From d18f34f255226612093d0a088d0274f573bae5d5 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr@fedoraproject.org>
Date: Jul 18 2023 05:33:02 +0000
Subject: [PATCH 1/2] Move `@base-x` group to the variants that use X11


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index e9039c7..fdae309 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -12,6 +12,7 @@ exclude_list_groups:
   - libreoffice
   - gnome-desktop
   - container-management
+  - base-x
 
 # PackageKit is spread across various groups
 # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
@@ -99,6 +100,8 @@ exclude_list:
     - gnome-shell-extension-background-logo
     - pinentry-gnome3
     - qgnomeplatform-qt5
+    # X11 specific
+    - xorg-x11-drv-libinput
   networkmanager-submodules:
     # Let's use the builtin one by default
     - dhcp-client
diff --git a/comps-sync.py b/comps-sync.py
index b12573a..9310959 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -163,15 +163,15 @@ if (n_manifest_new > 0 or n_comps_new > 0) and args.save:
 
 # List of comps groups used for each desktop
 desktops_comps_groups = {
-    "gnome": ["gnome-desktop"],
-    "kde": ["kde-desktop"],
-    "xfce": ["xfce-desktop"],
-    "lxqt": ["lxqt-desktop"],
-    "deepin": ["deepin-desktop"],
-    "mate": ["mate-desktop"],
+    "gnome": ["gnome-desktop", "base-x"],
+    "kde": ["kde-desktop", "base-x"],
+    "xfce": ["xfce-desktop", "base-x"],
+    "lxqt": ["lxqt-desktop", "base-x"],
+    "deepin": ["deepin-desktop", "base-x"],
+    "mate": ["mate-desktop", "base-x"],
     "sway": ["swaywm", "swaywm-extended"],
-    "cinnamon": ["cinnamon-desktop"],
-    "budgie": ["budgie-desktop", "budgie-desktop-apps"]
+    "cinnamon": ["cinnamon-desktop", "base-x"],
+    "budgie": ["budgie-desktop", "budgie-desktop-apps", "base-x"]
 }
 
 # Generate treefiles for all desktops

From 11fb756e709745d9d998955b76f110d2900a3675 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr@fedoraproject.org>
Date: Jul 22 2023 17:42:56 +0000
Subject: [PATCH 2/2] comps-sync f39 2023-07-22


With fedora-comps#859 applied.

---

diff --git a/budgie-desktop-pkgs.yaml b/budgie-desktop-pkgs.yaml
index b9bf5a7..a14f2a6 100644
--- a/budgie-desktop-pkgs.yaml
+++ b/budgie-desktop-pkgs.yaml
@@ -22,6 +22,7 @@ packages:
   - firefox
   - fprintd-pam
   - glib-networking
+  - glx-utils
   - gnome-bluetooth
   - gnome-color-manager
   - gnome-disk-utility
@@ -39,11 +40,32 @@ packages:
   - gvfs-mtp
   - gvfs-smb
   - lightdm
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - nemo
   - network-manager-applet
+  - plymouth-system-theme
   - polkit
   - seahorse
   - slick-greeter
   - xdg-desktop-portal
   - xdg-desktop-portal-gtk
   - xdg-user-dirs-gtk
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
+  - 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-vesa
+  - xorg-x11-drv-vmware
+packages-aarch64:
+  - xorg-x11-drv-armsoc
diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index 759f8dd..0d42b3a 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -16,6 +16,7 @@ packages:
   - cinnamon-screensaver
   - firefox
   - firewall-config
+  - glx-utils
   - gnome-disk-utility
   - gnome-screenshot
   - gnome-system-monitor
@@ -27,6 +28,8 @@ packages:
   - gvfs-smb
   - imsettings-gsettings
   - initial-setup-gui
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - metacity
   - nemo-fileroller
   - nemo-image-converter
@@ -34,6 +37,7 @@ packages:
   - nm-connection-editor
   - pipewire-alsa
   - pipewire-pulseaudio
+  - plymouth-system-theme
   - powerline
   - qgnomeplatform-qt5
   - redshift-gtk
@@ -44,3 +48,21 @@ packages:
   - wireplumber
   - xawtv
   - xdg-user-dirs-gtk
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
+  - 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-vesa
+  - xorg-x11-drv-vmware
+packages-aarch64:
+  - xorg-x11-drv-armsoc
diff --git a/deepin-desktop-pkgs.yaml b/deepin-desktop-pkgs.yaml
index 82e8f1e..dc1fa9e 100644
--- a/deepin-desktop-pkgs.yaml
+++ b/deepin-desktop-pkgs.yaml
@@ -12,7 +12,27 @@ packages:
   - deepin-screenshot
   - deepin-system-monitor
   - firewall-config
+  - glx-utils
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
+  - plymouth-system-theme
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
+  - 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:
   - chromium
+  - xorg-x11-drv-intel
+  - xorg-x11-drv-openchrome
+  - xorg-x11-drv-vesa
+  - xorg-x11-drv-vmware
 packages-aarch64:
   - chromium
+  - xorg-x11-drv-armsoc
diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index d7e1f02..094ccd8 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -58,7 +58,6 @@ packages:
   - gamemode
   - glibc
   - glibc-all-langpacks
-  - glx-utils
   - gnupg2
   - google-noto-color-emoji-fonts
   - google-noto-naskh-arabic-vf-fonts
@@ -131,8 +130,6 @@ packages:
   - man-db
   - man-pages
   - mdadm
-  - mesa-dri-drivers
-  - mesa-vulkan-drivers
   - mpage
   - mt7xxx-firmware
   - mtr
@@ -212,17 +209,6 @@ packages:
   - wireplumber
   - words
   - wpa_supplicant
-  - xorg-x11-drv-amdgpu
-  - xorg-x11-drv-ati
-  - xorg-x11-drv-evdev
-  - xorg-x11-drv-fbdev
-  - 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
   - zip
   - zram-generator-defaults
 packages-x86_64:
@@ -233,14 +219,9 @@ packages-x86_64:
   - open-vm-tools-desktop
   - thermald
   - virtualbox-guest-additions
-  - xorg-x11-drv-intel
-  - xorg-x11-drv-openchrome
-  - xorg-x11-drv-vesa
-  - xorg-x11-drv-vmware
 packages-aarch64:
   - hyperv-daemons
   - open-vm-tools-desktop
-  - xorg-x11-drv-armsoc
 packages-ppc64le:
   - lsvpd
   - powerpc-utils
diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml
index 94a7c4e..c52cdb5 100644
--- a/gnome-desktop-pkgs.yaml
+++ b/gnome-desktop-pkgs.yaml
@@ -18,6 +18,7 @@ packages:
   - fprintd-pam
   - gdm
   - glib-networking
+  - glx-utils
   - gnome-backgrounds
   - gnome-bluetooth
   - gnome-browser-connector
@@ -49,8 +50,10 @@ packages:
   - libsane-hpaio
   - mesa-dri-drivers
   - mesa-libEGL
+  - mesa-vulkan-drivers
   - nautilus
   - orca
+  - plymouth-system-theme
   - polkit
   - rygel
   - systemd-oomd-defaults
@@ -60,4 +63,22 @@ packages:
   - xdg-desktop-portal-gnome
   - xdg-desktop-portal-gtk
   - xdg-user-dirs-gtk
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
+  - 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
   - yelp
+packages-x86_64:
+  - xorg-x11-drv-intel
+  - xorg-x11-drv-openchrome
+  - xorg-x11-drv-vesa
+  - xorg-x11-drv-vmware
+packages-aarch64:
+  - xorg-x11-drv-armsoc
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index f8743a7..2bd7962 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -14,6 +14,7 @@ packages:
   - flatpak-kcm
   - fprintd-pam
   - glibc-all-langpacks
+  - glx-utils
   - gnome-keyring-pam
   - kcharselect
   - kde-connect
@@ -46,6 +47,8 @@ packages:
   - kwin
   - kwrite
   - libappindicator-gtk3
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - pam-kwallet
   - phonon-qt5-backend-gstreamer
   - pinentry-qt
@@ -69,6 +72,7 @@ packages:
   - plasma-workspace-geolocation
   - plasma-workspace-wallpapers
   - plasma-workspace-x11
+  - plymouth-system-theme
   - polkit-kde
   - qt-at-spi
   - qt5-qtbase-gui
@@ -79,9 +83,24 @@ packages:
   - spectacle
   - systemd-oomd-defaults
   - udisks2
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
   - 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
   - xwaylandvideobridge
 packages-x86_64:
   - kio-gdrive
+  - xorg-x11-drv-intel
+  - xorg-x11-drv-openchrome
+  - xorg-x11-drv-vesa
+  - xorg-x11-drv-vmware
 packages-aarch64:
   - kio-gdrive
+  - xorg-x11-drv-armsoc
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml
index 04d0a56..0fac8c1 100644
--- a/lxqt-desktop-pkgs.yaml
+++ b/lxqt-desktop-pkgs.yaml
@@ -5,6 +5,7 @@ packages:
   - breeze-gtk
   - breeze-icon-theme
   - firewall-config
+  - glx-utils
   - initial-setup-gui
   - lxqt-about
   - lxqt-archiver
@@ -20,6 +21,8 @@ packages:
   - lxqt-session
   - lxqt-themes
   - lxqt-themes-fedora
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - network-manager-applet
   - nm-connection-editor
   - notification-daemon
@@ -27,13 +30,30 @@ packages:
   - openbox
   - pcmanfm-qt
   - perl-File-MimeInfo
+  - plymouth-system-theme
   - qterminal
   - sddm
   - sddm-themes
   - sddm-x11
   - upower
   - xdg-user-dirs
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
+  - 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:
   - falkon
+  - xorg-x11-drv-intel
+  - xorg-x11-drv-openchrome
+  - xorg-x11-drv-vesa
+  - xorg-x11-drv-vmware
 packages-aarch64:
   - falkon
+  - xorg-x11-drv-armsoc
diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml
index 52ac11e..9d82773 100644
--- a/mate-desktop-pkgs.yaml
+++ b/mate-desktop-pkgs.yaml
@@ -32,6 +32,7 @@ packages:
   - fedora-release-matecompiz
   - firefox
   - firewall-config
+  - glx-utils
   - gnome-epub-thumbnailer
   - gnome-themes-extra
   - gstreamer1-plugins-ugly-free
@@ -79,6 +80,8 @@ packages:
   - mate-themes
   - mate-user-admin
   - mate-user-guide
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - mozo
   - network-manager-applet
   - nm-connection-editor
@@ -88,6 +91,7 @@ packages:
   - pipewire-alsa
   - pipewire-pulseaudio
   - pluma
+  - plymouth-system-theme
   - seahorse
   - seahorse-caja
   - setroubleshoot
@@ -98,4 +102,22 @@ packages:
   - usermode-gtk
   - xdg-user-dirs-gtk
   - xmodmap
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
+  - 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-vesa
+  - xorg-x11-drv-vmware
+packages-aarch64:
+  - xorg-x11-drv-armsoc
diff --git a/sway-desktop-pkgs.yaml b/sway-desktop-pkgs.yaml
index ee8ae43..f990970 100644
--- a/sway-desktop-pkgs.yaml
+++ b/sway-desktop-pkgs.yaml
@@ -27,7 +27,7 @@ packages:
   - polkit
   - pulseaudio-utils
   - sddm
-  - sddm-x11
+  - sddm-wayland-sway
   - slurp
   - sway
   - sway-config-fedora
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index 3eea8f9..9ab5ba0 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -11,6 +11,7 @@ packages:
   - adwaita-icon-theme
   - blueman
   - desktop-backgrounds-compat
+  - glx-utils
   - gnome-keyring-pam
   - greybird-dark-theme
   - greybird-light-theme
@@ -22,9 +23,12 @@ packages:
   - gvfs-mtp
   - initial-setup-gui
   - lightdm-gtk
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - mint-y-theme
   - network-manager-applet
   - nm-connection-editor
+  - plymouth-system-theme
   - thunar-archive-plugin
   - thunar-media-tags-plugin
   - thunar-volman
@@ -47,3 +51,21 @@ packages:
   - xfdesktop
   - xfwm4
   - xfwm4-themes
+  - xorg-x11-drv-amdgpu
+  - xorg-x11-drv-ati
+  - xorg-x11-drv-evdev
+  - xorg-x11-drv-fbdev
+  - 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-vesa
+  - xorg-x11-drv-vmware
+packages-aarch64:
+  - xorg-x11-drv-armsoc