From c0ede011079b6aefa2d2157c0f99fe583e18a598 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 09 2021 12:43:07 +0000
Subject: [PATCH 1/3] Revert "Kinoite: Add back some apps until we have Flatpaks"


This reverts commit 9f9e2588120671db89859c2cebcc5d99db94adbf.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 330d3f6..b369b08 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -176,8 +176,10 @@ desktop_exclude_list:
     - akregator
     - cagibi
     - elisa-player
+    - gwenview
     - kaddressbook
     - kamera
+    - kcalc
     - kcharselect
     - kcolorchooser
     - kde-partitionmanager
@@ -194,7 +196,9 @@ desktop_exclude_list:
     - korganizer
     - kruler
     - ksshaskpass
+    - kwrite
     - libreoffice-kde
+    - okular
     # Misc
     - adwaita-gtk2-theme
     - colord-kde
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index ffdaa7a..760d141 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -8,9 +8,7 @@ packages:
   - firewall-config
   - glibc-all-langpacks
   - gnome-keyring-pam
-  - gwenview
   - initial-setup-gui
-  - kcalc
   - kde-gtk-config
   - kde-print-manager
   - kde-settings-pulseaudio
@@ -31,8 +29,6 @@ packages:
   - kscreenlocker
   - kwalletmanager5
   - kwin
-  - kwrite
-  - okular
   - pam-kwallet
   - phonon-qt5-backend-gstreamer
   - pinentry-qt

From 571fbe566cb702b865612005a50f8b01e84491ae Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 09 2021 12:57:58 +0000
Subject: [PATCH 2/3] Kinoite: Move temporarily kept apps to the manifest


See parent commit for the precedent implementation.

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 99790da..2cbbaca 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -15,6 +15,12 @@ packages:
   - xdg-desktop-portal-kde
   # Provide an archive manager by default
   - ark
+  # Keep some basic apps installed until we have Flatpaks available
+  # See https://pagure.io/fedora-kde/SIG/issue/13
+  - gwenview
+  - kcalc
+  - kwrite
+  - okular
 
 # Make sure the following are not pulled in when Recommended by other packages
 exclude-packages:

From 0d5b9c0778f2e4ef4a29e5434c11ca70edd4db12 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 09 2021 12:57:58 +0000
Subject: [PATCH 3/3] Kinoite: Add xdg-desktop-portal-gnome


The GNOME portal is required for settings support in some GNOME Apps.

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

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 2cbbaca..2e488fb 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -13,6 +13,9 @@ 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