diff --git a/0001-flatpak-Set-the-plugin-better-than-rpm-ostree.patch b/0001-flatpak-Set-the-plugin-better-than-rpm-ostree.patch deleted file mode 100644 index 5c9b573..0000000 --- a/0001-flatpak-Set-the-plugin-better-than-rpm-ostree.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 604e2e976ee678e7e31e0f9ff60058e9036967fc Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 14 Oct 2022 09:29:30 +0200 -Subject: [PATCH] flatpak: Set the plugin better than rpm-ostree - -It's already set better than packagekit, thus it's better than rpm-ostree -as well. - -Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1941 ---- - plugins/flatpak/gs-plugin-flatpak.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/flatpak/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c -index 8bb612fcd..7c893ef67 100644 ---- a/plugins/flatpak/gs-plugin-flatpak.c -+++ b/plugins/flatpak/gs-plugin-flatpak.c -@@ -96,6 +96,7 @@ gs_plugin_flatpak_init (GsPluginFlatpak *self) - - /* prioritize over packages */ - gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_BETTER_THAN, "packagekit"); -+ gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_BETTER_THAN, "rpm-ostree"); - - /* set name of MetaInfo file */ - gs_plugin_set_appstream_id (plugin, "org.gnome.Software.Plugin.Flatpak"); --- -2.37.3 - diff --git a/0001-gs-app-Use-real-app-plugin-priority-in-gs_app_compar.patch b/0001-gs-app-Use-real-app-plugin-priority-in-gs_app_compar.patch deleted file mode 100644 index b15420e..0000000 --- a/0001-gs-app-Use-real-app-plugin-priority-in-gs_app_compar.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 39be84f7e4c903f6973115f809e3a288731e2d11 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 14 Oct 2022 09:18:28 +0200 -Subject: [PATCH] gs-app: Use real app/plugin priority in - gs_app_compare_priority() - -As Owen found out and reported in #1940, change in https://gitlab.gnome.org/GNOME/gnome-software/-/commit/e11a60b4a2ddadacbfbb1a8325b1e8daee574138 -did not consider the fact that gs_app_compare_priority() bypasses -the gs_app_get_priority(), thus the plugin priority was not -considered anymore. - -Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1940 ---- - lib/gs-app.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/lib/gs-app.c b/lib/gs-app.c -index d4b3f912a..51215c7e0 100644 ---- a/lib/gs-app.c -+++ b/lib/gs-app.c -@@ -400,14 +400,17 @@ gs_app_compare_priority (GsApp *app1, GsApp *app2) - { - GsAppPrivate *priv1 = gs_app_get_instance_private (app1); - GsAppPrivate *priv2 = gs_app_get_instance_private (app2); -+ guint prio1, prio2; - - g_return_val_if_fail (GS_IS_APP (app1), 0); - g_return_val_if_fail (GS_IS_APP (app2), 0); - - /* prefer prio */ -- if (priv1->priority > priv2->priority) -+ prio1 = gs_app_get_priority (app1); -+ prio2 = gs_app_get_priority (app2); -+ if (prio1 > prio2) - return -1; -- if (priv1->priority < priv2->priority) -+ if (prio1 < prio2) - return 1; - - /* fall back to bundle kind */ -@@ -5143,7 +5146,7 @@ gs_app_get_priority (GsApp *app) - if (priv->priority == 0) { - g_autoptr(GsPlugin) plugin = gs_app_dup_management_plugin (app); - if (plugin != NULL) -- return gs_plugin_get_priority (plugin); -+ priv->priority = gs_plugin_get_priority (plugin); - } - - return priv->priority; --- -2.37.3 - diff --git a/0001-gs-plugin-job-list-apps-Filter-out-invalid-apps.patch b/0001-gs-plugin-job-list-apps-Filter-out-invalid-apps.patch deleted file mode 100644 index 1597f92..0000000 --- a/0001-gs-plugin-job-list-apps-Filter-out-invalid-apps.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 79515873a275fff8f3f0713fb232e463358865bf Mon Sep 17 00:00:00 2001 -From: Georges Basile Stavracas Neto -Date: Thu, 29 Sep 2022 10:18:22 -0300 -Subject: [PATCH] gs-plugin-job-list-apps: Filter out invalid apps - -This filtering was lost with 7d54958d4e46e27af2cbdfc7f529611f4709d7fe. - -Filter out invalid apps as it did before. - -Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1932 ---- - lib/gs-plugin-job-list-apps.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/lib/gs-plugin-job-list-apps.c b/lib/gs-plugin-job-list-apps.c -index 811c7c08f..a556387e5 100644 ---- a/lib/gs-plugin-job-list-apps.c -+++ b/lib/gs-plugin-job-list-apps.c -@@ -136,6 +136,19 @@ gs_plugin_job_list_apps_set_property (GObject *object, - } - } - -+static gboolean -+filter_valid_apps (GsApp *app, -+ gpointer user_data) -+{ -+ GsPluginJobListApps *self = GS_PLUGIN_JOB_LIST_APPS (user_data); -+ GsPluginRefineFlags refine_flags = GS_PLUGIN_REFINE_FLAGS_NONE; -+ -+ if (self->query) -+ refine_flags = gs_app_query_get_refine_flags (self->query); -+ -+ return gs_plugin_loader_app_is_valid (app, refine_flags); -+} -+ - static gboolean - app_filter_qt_for_gtk_and_compatible (GsApp *app, - gpointer user_data) -@@ -345,6 +358,7 @@ finish_task (GTask *task, - /* Standard filtering. - * - * FIXME: It feels like this filter should be done in a different layer. */ -+ gs_app_list_filter (merged_list, filter_valid_apps, self); - gs_app_list_filter (merged_list, app_filter_qt_for_gtk_and_compatible, plugin_loader); - - /* Caller-specified filtering. */ --- -2.37.3 - diff --git a/gnome-software.spec b/gnome-software.spec index e127318..4b60ca8 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -17,8 +17,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$ Name: gnome-software -Version: 43.0 -Release: 4%{?dist} +Version: 43.1 +Release: 1%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -26,11 +26,6 @@ URL: https://wiki.gnome.org/Apps/Software Source0: https://download.gnome.org/sources/gnome-software/43/%{name}-%{tarball_version}.tar.xz Patch01: 0001-crash-with-broken-theme.patch -Patch02: 0002-install-rpm-file.patch -Patch03: 0003-rpm-ostree-download-size.patch -Patch04: 0001-gs-plugin-job-list-apps-Filter-out-invalid-apps.patch -Patch05: 0001-gs-app-Use-real-app-plugin-priority-in-gs_app_compar.patch -Patch06: 0001-flatpak-Set-the-plugin-better-than-rpm-ostree.patch BuildRequires: docbook-style-xsl BuildRequires: desktop-file-utils @@ -216,6 +211,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/gtk-doc/html/gnome-software/ %changelog +* Mon Oct 24 2022 Milan Crha - 43.1-1 +- Update to 43.1 + * Mon Oct 17 2022 Tomas Popela - 43.0-4 - Resolves: #2135289 (RPM packaged applications are presented in GNOME Software and preferred over Flatpaks on Silverblue) diff --git a/sources b/sources index 2cc3ac4..d76eee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-43.0.tar.xz) = bcf64e4d3d847c660fd1c1a2356235569560bc315fb6b0d2e459dfb1bbee7bf97d9a14f7c8ef1129e01241385cd1540d1499f9cc9ad99a996965feb48e698d6a +SHA512 (gnome-software-43.1.tar.xz) = 5494622e1c52bcf660df8ab83cd73720ccab3c767f8870b6a23bd83c396972c508beb365e6df143055e3a7d9e77b42f01ea73a49d8dcdcf97aaeada0fe9f03e5