From 2624f318c4d75872c50114c9e5bc4a55b51dba63 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:16:06 +0000
Subject: [PATCH 1/5] Kinoite: Remove explicit xdg-desktop-portal-gnome inclusion


Inclusion was moved to the KDE comps group.
See https://pagure.io/fedora-kde/SIG/issue/120

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 2b8089b..9b5de2f 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -13,9 +13,6 @@ packages:
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
   - xdg-desktop-portal-kde
-  # GNOME portal required for settings support in some GNOME Apps
-  # See https://pagure.io/fedora-kde/SIG/issue/120
-  - xdg-desktop-portal-gnome
   # Provide an archive manager by default
   - ark
   # Keep some basic apps installed until we have Flatpaks available

From ad66f4e101eef05079fa8f257c8d3e93807fe3d8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:35:53 +0000
Subject: [PATCH 2/5] fedora-common-ostree: Minor cosmetic fix


---

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index f4039c8..6b06e46 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -46,8 +46,12 @@ ignore-removed-users:
   - root
 ignore-removed-groups:
   - root
-check-passwd: { type: file, filename: passwd }
-check-groups: { type: file, filename: group }
+check-passwd:
+  type: file
+  filename: passwd
+check-groups:
+  type: file
+  filename: group
 
 default_target: graphical.target
 

From 6f00dbff7f58425a927cb502dec8be586e40c7c1 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:35:53 +0000
Subject: [PATCH 3/5] Kinoite: Keep kde-partitionmanager


Re-add kde-partitionmanager to the base image until we have it available
as a Flatpak.

See: https://pagure.io/fedora-kde/SIG/issue/131

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index b369b08..fb3bc22 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -182,7 +182,6 @@ desktop_exclude_list:
     - kcalc
     - kcharselect
     - kcolorchooser
-    - kde-partitionmanager
     - kdnssd
     - kf5-kipi-plugins
     - kfind
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 760d141..3f21f97 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -10,6 +10,7 @@ packages:
   - gnome-keyring-pam
   - initial-setup-gui
   - kde-gtk-config
+  - kde-partitionmanager
   - kde-print-manager
   - kde-settings-pulseaudio
   - kdegraphics-thumbnailers

From b58f3c4bb70358574729ce109b016494c69105c4 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:35:53 +0000
Subject: [PATCH 4/5] Kinoite: Exclude plasma-pk-updates


plasma-pk-updates is only useful with PackageKit and thus not needed on
Kinoite.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index fb3bc22..92636ab 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -172,6 +172,7 @@ desktop_exclude_list:
     - abrt-desktop
     - cups-pk-helper
     - dnfdragora
+    - plasma-pk-updates
     # Non-critical apps -> Flatpak
     - akregator
     - cagibi
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 9b5de2f..cc331f8 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -28,6 +28,7 @@ exclude-packages:
   - plasma-discover-packagekit
   # Exclude currently broken support for rpm-ostree in Discover
   - plasma-discover-rpm-ostree
+  - plasma-pk-updates
 
 repos:
   - fedora-35

From 40049fb271e8cd9d54098af2116f703f3ad45d0b Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:35:54 +0000
Subject: [PATCH 5/5] comps-sync f35 2021-11-15


---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 9c675f0..f8492a7 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -100,6 +100,7 @@ packages:
   - iwl6000g2b-firmware
   - iwl6050-firmware
   - iwl7260-firmware
+  - iwlax2xx-firmware
   - jomolhari-fonts
   - kbd
   - kernel
diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml
index 4a2901b..5200e7a 100644
--- a/gnome-desktop-pkgs.yaml
+++ b/gnome-desktop-pkgs.yaml
@@ -59,6 +59,7 @@ packages:
   - tracker
   - tracker-miners
   - xdg-desktop-portal
+  - xdg-desktop-portal-gnome
   - xdg-desktop-portal-gtk
   - xdg-user-dirs-gtk
   - yelp
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 3f21f97..6c48e82 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -59,4 +59,5 @@ packages:
   - sddm-breeze
   - sddm-kcm
   - spectacle
+  - xdg-desktop-portal-gnome
   - xorg-x11-drv-libinput