From 809af279a98ae0da55ea0a3afdcc3d801485a90f Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 1/11] Kinoite: Keep kcharselect Keep kcharselect in the base image as it's needed for multi-language and accessibility. See: https://pagure.io/fedora-kde/SIG/issue/331 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 3df1db3..b7d1ce6 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -156,7 +156,6 @@ desktop_exclude_list: - kaddressbook - kamera - kcalc - - kcharselect - kcolorchooser - kdnssd - kf5-kipi-plugins diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 07be05b..f1370d9 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -11,6 +11,7 @@ packages: - fprintd-pam - glibc-all-langpacks - gnome-keyring-pam + - kcharselect - kde-connect - kde-gtk-config - kde-partitionmanager From 1e541b855983a07ea23956aa75cab51dc3a82f56 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 2/11] Kinoite: Add back KFind It's hard to Flatpak as it needs access to the entire filesystem and should be included by default so we include it in the base image. See: https://pagure.io/fedora-kde/SIG/issue/13 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index b7d1ce6..c6acc44 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -159,7 +159,6 @@ desktop_exclude_list: - kcolorchooser - kdnssd - kf5-kipi-plugins - - kfind - kget - kgpg - kmail diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index f1370d9..1cd594d 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -23,6 +23,7 @@ packages: - kf5-akonadi-server - kf5-akonadi-server-mysql - kf5-baloo-file + - kfind - khelpcenter - khotkeys - kinfocenter From bbbee578c9e781087acd985cb2f56c0086b4dfe1 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 3/11] Kinoite: ark & kwrite come from the kde-desktop group We now directly pick the default apps to include via the kde-desktop comps group. See: https://pagure.io/fedora-comps/pull-request/824 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index c6acc44..3370e07 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -169,7 +169,6 @@ desktop_exclude_list: - korganizer - kruler - ksshaskpass - - kwrite - libreoffice-kde - okular # Misc diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 806b5c2..678f812 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -13,13 +13,10 @@ packages: - xorg-x11-server-Xwayland # Portals for Flatpak - 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 # Install some minor optional tools for KInfoCenter - vulkan-tools diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 1cd594d..ad50fdc 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -2,6 +2,7 @@ include: fedora-common-ostree.yaml packages: - NetworkManager-config-connectivity-fedora + - ark - bluedevil - breeze-icon-theme - dolphin @@ -36,6 +37,7 @@ packages: - kscreenlocker - kwalletmanager5 - kwin + - kwrite - libappindicator-gtk3 - pam-kwallet - phonon-qt5-backend-gstreamer From 9995a5f61bbaff0744822056737adc894025a6de Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 4/11] Kinoite: gwenview, kcalc & okular shipped as Flatpaks Those applications are now available as Fedora Flatpaks so we can now remove them from the image. --- diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 678f812..be6e4c7 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -13,11 +13,6 @@ packages: - xorg-x11-server-Xwayland # Portals for Flatpak - xdg-desktop-portal-kde - # Keep some basic apps installed until we have Flatpaks available - # See https://pagure.io/fedora-kde/SIG/issue/13 - - gwenview - - kcalc - - okular # Install some minor optional tools for KInfoCenter - vulkan-tools - xdpyinfo From d0828c19fefac361473412bd8750e7b325bb079a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 5/11] Kinoite: Update exclude list All non critical KDE Apps have been moved out of the kde-desktop comps group so we don't need to exclude them anymore. See: https://pagure.io/fedora-comps/pull-request/824 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 3370e07..f735bde 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -148,33 +148,11 @@ desktop_exclude_list: - cups-pk-helper - dnfdragora - plasma-pk-updates - # Non-critical apps -> Flatpak - - akregator - - cagibi - - elisa-player - - gwenview - - kaddressbook - - kamera - - kcalc - - kcolorchooser - kdnssd - - kf5-kipi-plugins - - kget - - kgpg - - kmail - - kmouth - - knode - - konqueror - - kontact - - korganizer - - kruler - ksshaskpass - - libreoffice-kde - - okular # Misc - adwaita-gtk2-theme - colord-kde - - keditbookmarks - kwebkitpart - plasma-nm-l2tp - plasma-nm-openswan From 3147df5394cc69336130aab286661a6ee6f10d64 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 6/11] Kinoite: Ensure that modem support (ppp) in included See: https://pagure.io/fedora-kde/SIG/issue/114 --- diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index be6e4c7..0c63c13 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -24,6 +24,8 @@ packages: - bcache-tools - dmraid - mobile-broadband-provider-info + # Make sure that modem support is installed + - NetworkManager-ppp # Make sure the following are not pulled in when Recommended by other packages exclude-packages: From f5e1410024d55330c5d4886f8765d9fa703cfa9a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 7/11] Kinoite: Do not exclude adwaita-gtk2-theme This is apparently needed for GTK2 apps, even in Flatpaks. Let's keep it in the image until this is fixed. See: https://pagure.io/fedora-kde/SIG/issue/307 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index f735bde..8373cdf 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -151,7 +151,6 @@ desktop_exclude_list: - kdnssd - ksshaskpass # Misc - - adwaita-gtk2-theme - colord-kde - kwebkitpart - plasma-nm-l2tp diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index ad50fdc..394d6b6 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -2,6 +2,7 @@ include: fedora-common-ostree.yaml packages: - NetworkManager-config-connectivity-fedora + - adwaita-gtk2-theme - ark - bluedevil - breeze-icon-theme From c838ef452e167529b22d680368331e58abd47ae5 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 8/11] Kinoite: Keep colord-kde (includes a KCM) Packages providing a KCM must be in the base image for Kinoite. --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 8373cdf..b45d230 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -151,7 +151,6 @@ desktop_exclude_list: - kdnssd - ksshaskpass # Misc - - colord-kde - kwebkitpart - plasma-nm-l2tp - plasma-nm-openswan diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 394d6b6..82159a2 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -6,6 +6,7 @@ packages: - ark - bluedevil - breeze-icon-theme + - colord-kde - dolphin - ffmpegthumbs - firewall-config From fc6ded71e72ab9f272523d35ad1e7fdc9a01321a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 9/11] Kinoite: Keep kdnssd (ZeroConf support) Includes a library optionaly used by Dolphin. --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index b45d230..0d3393c 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -148,7 +148,6 @@ desktop_exclude_list: - cups-pk-helper - dnfdragora - plasma-pk-updates - - kdnssd - ksshaskpass # Misc - kwebkitpart diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 82159a2..cfce9f6 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -23,6 +23,7 @@ packages: - kdegraphics-thumbnailers - kdeplasma-addons - kdialog + - kdnssd - kf5-akonadi-server - kf5-akonadi-server-mysql - kf5-baloo-file From b2733a74373da0c4b94c0181b5269880c2136089 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 10/11] Kinoite: Misc exclude list update --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 0d3393c..0094586 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -148,9 +148,10 @@ desktop_exclude_list: - cups-pk-helper - dnfdragora - plasma-pk-updates - - ksshaskpass # Misc + - ksshaskpass - kwebkitpart + # Remove some NetworkManager plugins that pull-in lesser used VPN packages - plasma-nm-l2tp - plasma-nm-openswan - plasma-nm-pptp From 546ebf68ee40b7b8dd0c271ab6b12a05525d5e6a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:55:54 +0000 Subject: [PATCH 11/11] comps-sync f39 2023-03-30 --- diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index cfce9f6..17f568e 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -9,6 +9,7 @@ packages: - colord-kde - dolphin - ffmpegthumbs + - filelight - firewall-config - flatpak-kcm - fprintd-pam @@ -36,6 +37,7 @@ packages: - kmenuedit - kmousetool - konsole5 + - krfb - kscreen - kscreenlocker - kwalletmanager5 diff --git a/sway-desktop-pkgs.yaml b/sway-desktop-pkgs.yaml index 1c65612..ee8ae43 100644 --- a/sway-desktop-pkgs.yaml +++ b/sway-desktop-pkgs.yaml @@ -23,6 +23,7 @@ packages: - pavucontrol - pinentry-gnome3 - playerctl + - plymouth-system-theme - polkit - pulseaudio-utils - sddm