From 78b140e2e82049939e8fa6f6fb3b4708ac287fef Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 11 2023 17:13:46 +0000
Subject: [PATCH 1/3] lazurite: Remove kwin-x11 & sddm-x11


X11 support is dropped with Plasma 6 in Fedora.

See: https://fedoraproject.org/wiki/Changes/KDE_Plasma_6

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index d9e935e..bd66188 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -221,6 +221,8 @@ desktop_exclude_list:
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
+    # X11 is going away with Plasma 6
+    - sddm-x11
   deepin-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml
index a75ab05..9ff3cec 100644
--- a/fedora-lazurite.yaml
+++ b/fedora-lazurite.yaml
@@ -11,7 +11,6 @@ packages:
   - fedora-release-ostree-desktop
   - libqtxdg
   - kvantum
-  - kwin-x11
   - kwin-wayland
   - plasma-systemsettings
   # Portals for Flatpak
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml
index 0fac8c1..b5340d9 100644
--- a/lxqt-desktop-pkgs.yaml
+++ b/lxqt-desktop-pkgs.yaml
@@ -34,7 +34,6 @@ packages:
   - qterminal
   - sddm
   - sddm-themes
-  - sddm-x11
   - upower
   - xdg-user-dirs
   - xorg-x11-drv-amdgpu

From 43965d4dda2897e1d8812eadde6b757dd1a34e5e Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 11 2023 17:14:23 +0000
Subject: [PATCH 2/3] Use new base-graphical comps group for Wayland only desktops


See: https://pagure.io/fedora-comps/pull-request/913
See: https://pagure.io/fedora-comps/pull-request/916

---

diff --git a/comps-sync.py b/comps-sync.py
index 89c2f75..03e5101 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -189,12 +189,12 @@ def main():
     # List of comps groups used for each desktop
     desktops_comps_groups = {
         "gnome": ["gnome-desktop", "base-x"],
-        "kde": ["kde-desktop"],
+        "kde": ["kde-desktop", "base-graphical"],
         "xfce": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"],
-        "lxqt": ["lxqt-desktop", "base-x"],
+        "lxqt": ["lxqt-desktop", "base-graphical"],
         "deepin": ["deepin-desktop", "base-x"],
         "mate": ["mate-desktop", "base-x"],
-        "sway": ["swaywm", "swaywm-extended"],
+        "sway": ["swaywm", "swaywm-extended", "base-graphical"],
         "cinnamon": ["cinnamon-desktop", "base-x"],
         "budgie": ["budgie-desktop", "budgie-desktop-apps", "base-x"]
     }
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 6354704..eb5ff51 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -44,6 +44,8 @@ packages:
   - kwin
   - kwrite
   - libappindicator-gtk3
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - orca
   - pam-kwallet
   - phonon-qt5-backend-gstreamer
@@ -68,6 +70,7 @@ packages:
   - plasma-workspace-geolocation
   - plasma-workspace-wallpapers
   - plasma-workspace-wayland
+  - plymouth-system-theme
   - polkit-kde
   - qt-at-spi
   - qt5-qtbase-gui
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml
index b5340d9..2704dde 100644
--- a/lxqt-desktop-pkgs.yaml
+++ b/lxqt-desktop-pkgs.yaml
@@ -5,7 +5,6 @@ packages:
   - breeze-gtk
   - breeze-icon-theme
   - firewall-config
-  - glx-utils
   - initial-setup-gui
   - lxqt-about
   - lxqt-archiver
@@ -36,23 +35,7 @@ packages:
   - sddm-themes
   - 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/sway-desktop-pkgs.yaml b/sway-desktop-pkgs.yaml
index f990970..231af16 100644
--- a/sway-desktop-pkgs.yaml
+++ b/sway-desktop-pkgs.yaml
@@ -19,6 +19,8 @@ packages:
   - imv
   - kanshi
   - lxqt-policykit
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
   - network-manager-applet
   - pavucontrol
   - pinentry-gnome3

From 9612fe3891ae6a66653141ce77ab5e3e607067bf Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 11 2023 17:14:23 +0000
Subject: [PATCH 3/3] comps-sync f40 2023-12-11


See: https://pagure.io/fedora-comps/c/d08b6b720d66253aa9cf81f72e3ab726337defa7?branch=main
See: https://pagure.io/fedora-comps/pull-request/915
See: https://fedoraproject.org/wiki/Changes/SSSDRemoveFilesProvider

---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 0304436..19a06f8 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -154,7 +154,6 @@ packages:
   - sos
   - spice-vdagent
   - spice-webdavd
-  - sssd
   - sssd-common
   - sssd-kcm
   - sudo