From 0bbd3e05ebbdf288d9b463d1b4e993bd9a2c74be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 8 Nov 2023 15:08:04 +0100
Subject: [PATCH] Kinoite: Remove X11 support

See: https://fedoraproject.org/wiki/Changes/KDE_Plasma_6
See: https://pagure.io/fesco/issue/3086
See: https://pagure.io/fedora-kde/SIG/issue/347
See: https://pagure.io/fedora-comps/pull-request/907
---
 comps-sync.py         |  2 +-
 fedora-kinoite.yaml   |  5 -----
 kde-desktop-pkgs.yaml | 23 ++---------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/comps-sync.py b/comps-sync.py
index 9170bb9..e271b9d 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -189,7 +189,7 @@ def main():
     # List of comps groups used for each desktop
     desktops_comps_groups = {
         "gnome": ["gnome-desktop", "base-x"],
-        "kde": ["kde-desktop", "base-x"],
+        "kde": ["kde-desktop"],
         "xfce": ["xfce-desktop", "base-x"],
         "lxqt": ["lxqt-desktop", "base-x"],
         "deepin": ["deepin-desktop", "base-x"],
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index fe4cec3..105d6e8 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -7,11 +7,6 @@ rojig:
 
 packages:
   - fedora-release-kinoite
-  # Wayland support
-  - kwayland-integration
-  - kwin-wayland
-  - plasma-workspace-wayland
-  - xorg-x11-server-Xwayland
   # Portals for Flatpak
   - xdg-desktop-portal-kde
   # Install some minor optional tools for KInfoCenter
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 1fde5c0..d475c5b 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -14,7 +14,6 @@ packages:
   - flatpak-kcm
   - fprintd-pam
   - glibc-all-langpacks
-  - glx-utils
   - gnome-keyring-pam
   - kcharselect
   - kde-connect
@@ -46,8 +45,6 @@ packages:
   - kwin
   - kwrite
   - libappindicator-gtk3
-  - mesa-dri-drivers
-  - mesa-vulkan-drivers
   - orca
   - pam-kwallet
   - phonon-qt5-backend-gstreamer
@@ -71,8 +68,7 @@ packages:
   - plasma-workspace
   - plasma-workspace-geolocation
   - plasma-workspace-wallpapers
-  - plasma-workspace-x11
-  - plymouth-system-theme
+  - plasma-workspace-wayland
   - polkit-kde
   - qt-at-spi
   - qt5-qtbase-gui
@@ -80,27 +76,12 @@ packages:
   - sddm
   - sddm-breeze
   - sddm-kcm
+  - sddm-wayland-plasma
   - 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