From f57275a0871d4a5533bda50c0deefbca08354331 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:48:52 +0000 Subject: [PATCH 1/8] 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 f2e053b..68ef021 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -181,7 +181,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 14dc35f..13c1b60 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -12,6 +12,7 @@ packages: - glibc-all-langpacks - gnome-keyring-pam - initial-setup-gui + - kcharselect - kde-connect - kde-gtk-config - kde-partitionmanager From 21322bff2cdf0a35cfbdde514e9b23d2be0420e0 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:49:20 +0000 Subject: [PATCH 2/8] Kinoite: Add krfb See: https://pagure.io/fedora-kde/SIG/issue/13#comment-846449 --- diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index ed45295..814acce 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -27,6 +27,8 @@ packages: # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview # See https://pagure.io/fedora-kde/SIG/issue/291 - kamera + # Include krfb by default. See: https://pagure.io/fedora-kde/SIG/issue/13 + - krfb # Make sure the following are not pulled in when Recommended by other packages exclude-packages: From 7a52347d59c8ddc90726f57442a12829dd4f7e31 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:49:27 +0000 Subject: [PATCH 3/8] 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 68ef021..1bb868b 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -184,7 +184,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 13c1b60..016d74a 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -24,6 +24,7 @@ packages: - kf5-akonadi-server - kf5-akonadi-server-mysql - kf5-baloo-file + - kfind - khelpcenter - khotkeys - kinfocenter From 1a9b405886f3095e0defc8ba726dadeed68f3fb9 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:49:38 +0000 Subject: [PATCH 4/8] 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 814acce..80cbda1 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -29,6 +29,8 @@ packages: - kamera # Include krfb by default. See: https://pagure.io/fedora-kde/SIG/issue/13 - krfb + # 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 2f7cc1386834491b6c112aa94166a2afcc442453 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:49:41 +0000 Subject: [PATCH 5/8] 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 1bb868b..776d7d0 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -198,7 +198,6 @@ desktop_exclude_list: - libreoffice-kde - okular # Misc - - adwaita-gtk2-theme - colord-kde - keditbookmarks - kwebkitpart diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 016d74a..7c87ae8 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 - bluedevil - breeze-icon-theme - dolphin From 597e4626a504ae583f9620570971bb065b0ccb9b Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:49:46 +0000 Subject: [PATCH 6/8] 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 776d7d0..3d5f02c 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -198,7 +198,6 @@ desktop_exclude_list: - libreoffice-kde - okular # Misc - - colord-kde - keditbookmarks - kwebkitpart - plasma-nm-l2tp diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 7c87ae8..5596ab1 100644 --- a/kde-desktop-pkgs.yaml +++ b/kde-desktop-pkgs.yaml @@ -5,6 +5,7 @@ packages: - adwaita-gtk2-theme - bluedevil - breeze-icon-theme + - colord-kde - dolphin - ffmpegthumbs - firewall-config From 2f6f89b334262e29cc834c64ff793e24a7ee8b8b Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:49:49 +0000 Subject: [PATCH 7/8] 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 3d5f02c..6134c19 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -182,7 +182,6 @@ desktop_exclude_list: - kamera - kcalc - kcolorchooser - - kdnssd - kf5-kipi-plugins - kget - kgpg diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml index 5596ab1..ba3867a 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 6bcdcaadad58d37ccad57aac2ee08b7447d168ca Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Mar 30 2023 16:50:25 +0000 Subject: [PATCH 8/8] comps-sync f37 2023-03-30 --- diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml index 3bd86d0..8c45a1e 100644 --- a/mate-desktop-pkgs.yaml +++ b/mate-desktop-pkgs.yaml @@ -23,10 +23,10 @@ packages: - dconf-editor - engrampa - eom - - f36-backgrounds-base - - f36-backgrounds-extras-base - - f36-backgrounds-extras-mate - - f36-backgrounds-mate + - f37-backgrounds-base + - f37-backgrounds-extras-base + - f37-backgrounds-extras-mate + - f37-backgrounds-mate - fedora-release-matecompiz - firefox - firewall-config