From 9baf4bad39fd4e1ddd6cc5c76d7977f3b0e6f3a1 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 02 2021 11:35:40 +0000
Subject: [PATCH 1/3] comps-sync-exclude-list: Exclude okular & elisa for Kinoite


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 9396069..949f680 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -169,6 +169,7 @@ desktop_exclude_list:
     # Non-critical apps -> Flatpak
     - akregator
     - cagibi
+    - elisa-player
     - gwenview
     - kaddressbook
     - kamera
@@ -191,6 +192,7 @@ desktop_exclude_list:
     - ksshaskpass
     - kwrite
     - libreoffice-kde
+    - okular
     - spectacle
     # Misc
     - adwaita-gtk2-theme

From 110d9296dc653e7d5eefdb6a2094985c9b62f942 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 03 2021 19:26:37 +0000
Subject: [PATCH 2/3] Make sure all openh264 packages are always excluded


According to https://fedoraproject.org/wiki/OpenH264, we can not ship
this in Silverblue.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 949f680..4aa2ed1 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -14,8 +14,12 @@ exclude_list_groups:
   - container-management
 
 # PackageKit is spread across various groups
+# We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
 exclude_list_all_regexp:
   - "PackageKit.*"
+  - "gstreamer1-plugin-openh264"
+  - "mozilla-openh264"
+  - "openh264"
 
 # Common exclude list for all ostree desktop versions
 exclude_list:
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index d8c14ae..e66c6cc 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -88,3 +88,7 @@ packages-x86_64:
 # Make sure the following are not pulled in when Recommended by other packages
 exclude-packages:
   - PackageKit
+  # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
+  - gstreamer1-plugin-openh264
+  - mozilla-openh264
+  - openh264

From f554d5f00e9e8d3ece77ee03d42e895e8f907ff0 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 03 2021 19:27:05 +0000
Subject: [PATCH 3/3] comps-sync rawhide 2021-02-02


---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 498c435..f99a8fd 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -9,7 +9,6 @@ packages:
   - abattis-cantarell-fonts
   - acl
   - adwaita-qt5
-  - alsa-plugins-pulseaudio
   - alsa-sof-firmware
   - alsa-ucm
   - alsa-utils
@@ -67,6 +66,7 @@ packages:
   - google-noto-sans-sinhala-vf-fonts
   - gstreamer1-plugins-bad-free
   - gstreamer1-plugins-good
+  - gstreamer1-plugins-ugly-free
   - gutenprint
   - gutenprint-cups
   - hostname
@@ -78,7 +78,6 @@ packages:
   - ibus-libpinyin
   - ibus-libzhuyin
   - ibus-m17n
-  - ibus-qt
   - ibus-typing-booster
   - iproute
   - iptables
@@ -151,6 +150,10 @@ packages:
   - passwdqc
   - pciutils
   - pinfo
+  - pipewire-alsa
+  - pipewire-gstreamer
+  - pipewire-pulseaudio
+  - pipewire-utils
   - plymouth
   - plymouth-system-theme
   - policycoreutils
@@ -158,13 +161,7 @@ packages:
   - procps-ng
   - psmisc
   - pt-sans-fonts
-  - pulseaudio
-  - pulseaudio-module-x11
-  - pulseaudio-utils
   - qemu-guest-agent
-  - qt
-  - qt-settings
-  - qt-x11
   - qt5-qtbase
   - qt5-qtbase-gui
   - qt5-qtdeclarative
diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml
index a47c1c3..fd31ff5 100644
--- a/gnome-desktop-pkgs.yaml
+++ b/gnome-desktop-pkgs.yaml
@@ -47,7 +47,6 @@ packages:
   - gvfs-gphoto2
   - gvfs-mtp
   - gvfs-smb
-  - libcanberra-gtk2
   - libcanberra-gtk3
   - libproxy-webkitgtk4
   - librsvg2
diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml
index 5dd9ed9..1f49c68 100644
--- a/mate-desktop-pkgs.yaml
+++ b/mate-desktop-pkgs.yaml
@@ -9,7 +9,6 @@ packages:
   - NetworkManager-ssh-gnome
   - NetworkManager-vpnc-gnome
   - NetworkManager-wwan
-  - alsa-plugins-pulseaudio
   - atril
   - atril-caja
   - atril-thumbnailer
@@ -83,6 +82,8 @@ packages:
   - orca
   - parole
   - pavucontrol
+  - pipewire-alsa
+  - pipewire-pulseaudio
   - pluma
   - seahorse
   - seahorse-caja

