From e14fd0f99affac5f3fa549122910d6e1dddd0685 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:22:44 +0000
Subject: [PATCH 1/6] fedora-rawhide.repo: use HTTPS


Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index e5d6336..5881c94 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -1,6 +1,6 @@
 [fedora-rawhide]
 name=Fedora rawhide $basearch
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux//development/rawhide/$basearch/os/
+#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/$basearch/os/
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=0
 gpgcheck=0

From cc7c43ebcc5a046f380fac02f85d5cc079c93b98 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:22:44 +0000
Subject: [PATCH 2/6] blacklist: remove rodent-icon-theme


Removed in Fedora 29.

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 8e3b9a8..7552627 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -227,8 +227,6 @@ desktop_blacklist:
     - firewall-config
     - openssh-askpass
     - vim-enhanced
-    # ?
-    - rodent-icon-theme
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater

From cc997ea1f1363c9cfcb172eb9b14152a9df1c303 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:22:44 +0000
Subject: [PATCH 3/6] Re-add gnome-keyring-pam for KDE variant


This is required for keyring unlock for users sessions.

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 7552627..1e12440 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -170,7 +170,6 @@ desktop_blacklist:
     # Non-critical apps -> Flatpak
     - akregator
     - cagibi
-    - gnome-keyring-pam
     - gwenview
     - kaddressbook
     - kamera
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 07b9445..21d273e 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -6,6 +6,7 @@ packages:
   - breeze-icon-theme
   - dolphin
   - glibc-all-langpacks
+  - gnome-keyring-pam
   - initial-setup-gui
   - kde-gtk-config
   - kde-print-manager

From 66ff3437102a903b0eb2a2d5c6fa770b13511f6a Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:22:44 +0000
Subject: [PATCH 4/6] kde & lxqt: keep an archive manager in the base image


Keep Arck (an archive manager) in the base image until we can install
flatpaks by default.

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 1e12440..2e3cd97 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -229,8 +229,6 @@ desktop_blacklist:
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
-    # Non-critical apps -> Flatpak
-    - ark
   deepin-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index ea1125c..25099f1 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -12,6 +12,8 @@ packages:
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
   - xdg-desktop-portal-kde
+  # Provide an archive manager by default
+  - ark
 
 repos:
   - fedora-rawhide
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml
index f044dd4..c6de606 100644
--- a/lxqt-desktop-pkgs.yaml
+++ b/lxqt-desktop-pkgs.yaml
@@ -1,6 +1,7 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
+  - ark
   - breeze-cursor-theme
   - breeze-gtk
   - breeze-icon-theme

From 02e11395ba6711dacbbec8d853660a53876ae337 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:28:41 +0000
Subject: [PATCH 5/6] XFCE: Blacklist uncommon NetworkManager plugins


---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 2e3cd97..dc02aaa 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -226,6 +226,13 @@ desktop_blacklist:
     - firewall-config
     - openssh-askpass
     - vim-enhanced
+    # Remove uncommon NetworkManager plugins
+    - NetworkManager-fortisslvpn-gnome
+    - NetworkManager-iodine-gnome
+    - NetworkManager-l2tp-gnome
+    - NetworkManager-libreswan-gnome
+    - NetworkManager-sstp-gnome
+    - NetworkManager-strongswan-gnome
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index ac08987..c9a333c 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -1,17 +1,14 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
-  - NetworkManager-fortisslvpn-gnome
-  - NetworkManager-iodine-gnome
-  - NetworkManager-l2tp-gnome
-  - NetworkManager-libreswan-gnome
+  - NetworkManager-adsl
   - NetworkManager-openconnect-gnome
   - NetworkManager-openvpn-gnome
+  - NetworkManager-ppp
   - NetworkManager-pptp-gnome
   - NetworkManager-ssh-gnome
-  - NetworkManager-sstp-gnome
-  - NetworkManager-strongswan-gnome
   - NetworkManager-vpnc-gnome
+  - NetworkManager-wwan
   - Thunar
   - adwaita-gtk2-theme
   - adwaita-icon-theme

From 64da52126b11d04449e6abd0f53e7d397b9cdcb9 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:28:41 +0000
Subject: [PATCH 6/6] comps-sync rawhide 2020-06-11


---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 97ce106..edabfa8 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -139,12 +139,12 @@ packages:
   - nss-altfiles
   - nss-mdns
   - ntfsprogs
-  - opensc
   - openssh-clients
   - openssh-server
   - paktype-naskh-basic-fonts
   - pam_afs_session
   - paps
+  - paratype-pt-sans-fonts
   - passwd
   - passwdqc
   - pciutils
@@ -155,7 +155,6 @@ packages:
   - policycoreutils-python-utils
   - procps-ng
   - psmisc
-  - pt-sans-fonts
   - pulseaudio
   - pulseaudio-module-x11
   - pulseaudio-utils

