Resolves: #2125569 (Correct property name in GsRemovalDialog .ui file)

0001-crash-with-broken-theme.patch

@@ -1,29 +1,22 @@
-From 3a644c151f27f439c36170f0958fd21cf1cc54d0 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 3 Jun 2021 08:33:53 +0200
 Subject: [PATCH] gs-feature-tile: Do not abort when the theme is broken
 
 Just print a warning when the theme doesn't provide 'theme_fg_color' and
 fallback to black color.
 
 Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1228
----
- src/gs-feature-tile.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
 
-diff --git a/src/gs-feature-tile.c b/src/gs-feature-tile.c
-index 1c85083eb..158af1e56 100644
---- a/src/gs-feature-tile.c
-+++ b/src/gs-feature-tile.c
-@@ -268,7 +268,6 @@ gs_feature_tile_refresh (GsAppTile *self)
+diff -up gnome-software-42.rc/src/gs-feature-tile.c.1 gnome-software-42.rc/src/gs-feature-tile.c
+--- gnome-software-42.rc/src/gs-feature-tile.c.1	2022-03-04 16:23:58.566735700 +0100
++++ gnome-software-42.rc/src/gs-feature-tile.c	2022-03-07 08:06:29.046595524 +0100
+@@ -411,7 +411,6 @@ gs_feature_tile_refresh (GsAppTile *self
  		if (key_colors != tile->key_colors_cache) {
  			g_autoptr(GArray) colors = NULL;
  			GdkRGBA fg_rgba;
 -			gboolean fg_rgba_valid;
  			GsHSBC fg_hsbc;
- 
- 			/* Look up the foreground colour for the feature tile,
-@@ -283,8 +282,17 @@ gs_feature_tile_refresh (GsAppTile *self)
+ 			const GsHSBC *chosen_hsbc;
+ 			GsHSBC chosen_hsbc_modified;
+@@ -429,8 +428,17 @@ gs_feature_tile_refresh (GsAppTile *self
  			 * @min_abs_contrast contrast with the foreground, so
  			 * that the text is legible.
  			 */
@@ -43,6 +36,3 @@ index 1c85083eb..158af1e56 100644
  
  			gtk_rgb_to_hsv (fg_rgba.red, fg_rgba.green, fg_rgba.blue,
  					&fg_hsbc.hue, &fg_hsbc.saturation, &fg_hsbc.brightness);
--- 
-GitLab
-

0002-shell-setup-order.patch

@@ -0,0 +1,134 @@
+diff --git a/lib/gs-appstream.c b/lib/gs-appstream.c
+index 38cc31bb5..c73adce6d 100644
+--- a/lib/gs-appstream.c
++++ b/lib/gs-appstream.c
+@@ -1626,12 +1626,12 @@ gs_appstream_add_categories (XbSilo *silo,
+ 			for (guint k = 0; k < groups->len; k++) {
+ 				const gchar *group = g_ptr_array_index (groups, k);
+ 				guint cnt = gs_appstream_count_component_for_groups (silo, group);
+-				for (guint l = 0; l < cnt; l++) {
+-					gs_category_increment_size (parent);
++				if (cnt > 0) {
++					gs_category_increment_size (parent, cnt);
+ 					if (children->len > 1) {
+ 						/* Parent category has multiple groups, so increment
+ 						 * each group's size too */
+-						gs_category_increment_size (cat);
++						gs_category_increment_size (cat, cnt);
+ 					}
+ 				}
+ 			}
+diff --git a/lib/gs-category.c b/lib/gs-category.c
+index b311c4941..4baede3bc 100644
+--- a/lib/gs-category.c
++++ b/lib/gs-category.c
+@@ -147,17 +147,19 @@ gs_category_set_size (GsCategory *category, guint size)
+ /**
+  * gs_category_increment_size:
+  * @category: a #GsCategory
++ * @value: how many to add
+  *
+- * Adds one to the size count if an application is available
++ * Adds @value to the size count.
+  *
+  * Since: 3.22
+  **/
+ void
+-gs_category_increment_size (GsCategory *category)
++gs_category_increment_size (GsCategory *category,
++			    guint value)
+ {
+ 	g_return_if_fail (GS_IS_CATEGORY (category));
+ 
+-	category->size++;
++	category->size += value;
+ 	g_object_notify_by_pspec (G_OBJECT (category), obj_props[PROP_SIZE]);
+ }
+ 
+diff --git a/lib/gs-category.h b/lib/gs-category.h
+index ecd2e1e23..1e82591aa 100644
+--- a/lib/gs-category.h
++++ b/lib/gs-category.h
+@@ -39,6 +39,7 @@ GsCategory	*gs_category_find_child		(GsCategory	*category,
+ GPtrArray	*gs_category_get_children	(GsCategory	*category);
+ 
+ guint		 gs_category_get_size		(GsCategory	*category);
+-void		 gs_category_increment_size	(GsCategory	*category);
++void		 gs_category_increment_size	(GsCategory	*category,
++						 guint		 value);
+ 
+ G_END_DECLS
+diff --git a/src/gs-shell.c b/src/gs-shell.c
+index db449a9b0..796d7b05a 100644
+--- a/src/gs-shell.c
++++ b/src/gs-shell.c
+@@ -107,6 +107,7 @@ struct _GsShell
+ 	GtkWidget		*primary_menu;
+ 	GtkWidget		*sub_page_header_title;
+ 
++	gboolean		 active_after_setup;
+ 	gboolean		 is_narrow;
+ 	guint			 allocation_changed_cb_id;
+ 
+@@ -165,6 +166,12 @@ gs_shell_modal_dialog_present (GsShell *shell, GtkWindow *window)
+ void
+ gs_shell_activate (GsShell *shell)
+ {
++	/* Waiting for plugin loader to setup first */
++	if (shell->plugin_loader == NULL) {
++		shell->active_after_setup = TRUE;
++		return;
++	}
++
+ 	gtk_widget_show (GTK_WIDGET (shell));
+ 	gtk_window_present (GTK_WINDOW (shell));
+ }
+@@ -2237,6 +2244,11 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
+ 		if (g_settings_get_boolean (shell->settings, "first-run"))
+ 			g_settings_set_boolean (shell->settings, "first-run", FALSE);
+ 	}
++
++	if (shell->active_after_setup) {
++		shell->active_after_setup = FALSE;
++		gs_shell_activate (shell);
++	}
+ }
+ 
+ void
+diff --git a/src/gs-application.c b/src/gs-application.c
+index e3f5f55c7..bdadd5c34 100644
+--- a/src/gs-application.c
++++ b/src/gs-application.c
+@@ -968,12 +968,9 @@ gs_application_startup (GApplication *application)
+ 							 G_CALLBACK (gs_application_shell_loaded_cb),
+ 							 app);
+ 
+-	gs_shell_setup (app->shell, app->plugin_loader, app->cancellable);
+ 	app->main_window = GTK_WINDOW (app->shell);
+ 	gtk_application_add_window (GTK_APPLICATION (app), app->main_window);
+ 
+-	app->update_monitor = gs_update_monitor_new (app, app->plugin_loader);
+-
+ 	gs_application_update_software_sources_presence (application);
+ 
+ 	/* Set up the plugins. */
+@@ -990,6 +987,7 @@ startup_cb (GObject      *source_object,
+             GAsyncResult *result,
+             gpointer      user_data)
+ {
++	GsApplication *app = GS_APPLICATION (user_data);
+ 	GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source_object);
+ 	g_autoptr(GError) local_error = NULL;
+ 
+@@ -1002,6 +1000,11 @@ startup_cb (GObject      *source_object,
+ 
+ 	/* show the priority of each plugin */
+ 	gs_plugin_loader_dump_state (plugin_loader);
++
++	/* Setup the shell only after the plugin loader finished its setup,
++	   thus all plugins are loaded and ready for the jobs. */
++	gs_shell_setup (app->shell, app->plugin_loader, app->cancellable);
++	app->update_monitor = gs_update_monitor_new (app, app->plugin_loader);
+ }
+ 
+ static void

0008-gs-removal-dialog-crrect-property-name.patch

@@ -0,0 +1,13 @@
+diff --git a/src/gs-removal-dialog.ui b/src/gs-removal-dialog.ui
+index 298900eb2..0cff1321a 100644
+--- a/src/gs-removal-dialog.ui
++++ b/src/gs-removal-dialog.ui
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <interface>
+   <template class="GsRemovalDialog" parent="GtkDialog">
+-    <property name="text" translatable="yes">Incompatible Software</property>
++    <property name="title" translatable="yes">Incompatible Software</property>
+     <property name="modal">True</property>
+     <property name="destroy_with_parent">True</property>
+     <child internal-child="headerbar">

gnome-software.spec

@@ -1,4 +1,5 @@
 %global appstream_version 0.14.0
+%global libadwaita_version 1.0.1
 %global libxmlb_version 0.1.7
 %global glib2_version 2.61.1
 %global gtk4_version 4.4.0
@@ -8,10 +9,13 @@
 %global fwupd_version 1.3.3
 %global flatpak_version 1.5.1
 
+# this is not a library version
+%define gs_plugin_version 18
+
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:      gnome-software
-Version:   42~alpha
+Version:   42.4
 Release:   2%{?dist}
 Summary:   A software center for GNOME
 
@@ -20,6 +24,8 @@ URL:       https://wiki.gnome.org/Apps/Software
 Source0:   https://download.gnome.org/sources/gnome-software/42/%{name}-%{tarball_version}.tar.xz
 
 Patch01:   0001-crash-with-broken-theme.patch
+Patch02:   0002-shell-setup-order.patch
+Patch03:   0008-gs-removal-dialog-crrect-property-name.patch
 
 BuildRequires: appstream-devel >= %{appstream_version}
 BuildRequires: gcc
@@ -36,7 +42,7 @@ BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
 BuildRequires: gtk-doc
 BuildRequires: json-glib-devel >= %{json_glib_version}
 BuildRequires: libdnf-devel
-BuildRequires: pkgconfig(libadwaita-1)
+BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version}
 BuildRequires: libsoup-devel
 BuildRequires: libxmlb-devel >= %{libxmlb_version}
 BuildRequires: malcontent-devel
@@ -73,9 +79,6 @@ Recommends: PackageKit%{?_isa} >= %{packagekit_version}
 Obsoletes: gnome-software-snap < 3.33.1
 Obsoletes: gnome-software-editor < 3.35.1
 
-# this is not a library version
-%define gs_plugin_version               17
-
 %description
 gnome-software is an application that makes it easy to add, remove
 and update software in the GNOME desktop.
@@ -101,7 +104,7 @@ and update software in the GNOME desktop.
 This package includes the rpm-ostree backend.
 
 %prep
-%autosetup -p1 -n %{name}-%{tarball_version}
+%autosetup -p1 -S gendiff -n %{name}-%{tarball_version}
 
 %build
 %meson \
@@ -110,6 +113,7 @@ This package includes the rpm-ostree backend.
     -Dmalcontent=true \
     -Dgudev=true \
     -Dpackagekit=true \
+    -Dpackagekit_autoremove=true \
     -Dexternal_appstream=false \
     -Drpm_ostree=true \
     -Dtests=false
@@ -147,8 +151,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_bindir}/gnome-software
 %{_datadir}/applications/gnome-software-local-file.desktop
 %{_datadir}/applications/org.gnome.Software.desktop
-%dir %{_datadir}/gnome-software
-%{_datadir}/gnome-software/*.png
 %{_mandir}/man1/gnome-software.1.gz
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Software.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Software-symbolic.svg
@@ -167,7 +169,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fwupd.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_generic-updates.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-blocklist.so
-%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_icons.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_malcontent.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_modalias.so
@@ -177,8 +178,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_provenance.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_repos.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_rewrite-resource.so
-%{_sysconfdir}/xdg/autostart/gnome-software-service.desktop
-%{_datadir}/app-info/xmls/org.gnome.Software.Featured.xml
+%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop
+%{_datadir}/swcatalog/xml/org.gnome.Software.Featured.xml
+%{_datadir}/swcatalog/xml/org.gnome.Software.Popular.xml
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 %{_datadir}/dbus-1/services/org.gnome.Software.service
 %{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini
@@ -198,6 +200,55 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc/html/gnome-software
 
 %changelog
+* Mon Sep 12 2022 Milan Crha <mcrha@redhat.com> - 42.4-2
+- Resolves: #2125569 (Correct property name in GsRemovalDialog .ui file)
+
+* Fri Aug 05 2022 Milan Crha <mcrha@redhat.com> - 42.4-1
+- Update to 42.4
+
+* Fri Jul 01 2022 Milan Crha <mcrha@redhat.com> - 42.3-1
+- Update to 42.3
+
+* Fri Jun 17 2022 Richard Hughes <rhughes@redhat.com> - 42.2-4
+- Add patch to make fwupd user requests work
+
+* Mon Jun 13 2022 Milan Crha <mcrha@redhat.com> - 42.2-2
+- Add patch for crash under gs_flatpak_refine_app_unlocked()
+
+* Mon May 30 2022 Milan Crha <mcrha@redhat.com> - 42.2-1
+- Update to 42.2
+- Add patch to correct order of the setup of the GsShell
+- Related: #2056082 (Enable PackageKit autoremove option)
+
+* Wed Apr 27 2022 Milan Crha <mcrha@redhat.com> - 42.1-1
+- Update to 42.1
+
+* Wed Apr 20 2022 Milan Crha <mcrha@redhat.com> - 42.0-4
+- Update patch for bug #2074121
+
+* Tue Apr 19 2022 Milan Crha <mcrha@redhat.com> - 42.0-3
+- Resolves: #2074121 (Enabling "Fedora Flathub Selection" repo doesn't show included apps)
+
+* Mon Apr 11 2022 Milan Crha <mcrha@redhat.com> - 42.0-2
+- Resolves: #2072661 (Workaround overlapping labels caused by gtk4 bug)
+- Resolves: #2073353 (RPM repos can't be disabled in GNOME Software after F35->F36 upgrade)
+
+* Fri Mar 18 2022 Milan Crha <mcrha@redhat.com> - 42.0-1
+- Update to 42.0
+
+* Thu Mar 10 2022 Milan Crha <mcrha@redhat.com> - 42.rc-2
+- Add upstream patches for gs-download-utils (i#1677 and i#1679)
+
+* Mon Mar 07 2022 Milan Crha <mcrha@redhat.com> - 42.rc-1
+- Update to 42.rc
+
+* Wed Feb 16 2022 Milan Crha <mcrha@redhat.com> - 42.beta-2
+- Resolves: #2054939 (Crash on a PackageKit app install)
+- Add a temporary workaround for gtk_widget_measure error flood on GsAppRow
+
+* Fri Feb 11 2022 Milan Crha <mcrha@redhat.com> - 42.beta-1
+- Update to 42.beta
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42~alpha-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (gnome-software-42.alpha.tar.xz) = fa63ab4cffe72f9f8b348cd7e021da515963258271310d3933d985f00190c3ffe0f1d664d65ec5ff577d153c6de5d11eef9b1e6d9aa1e171d27f0f1b570dbdeb
+SHA512 (gnome-software-42.4.tar.xz) = 00c70886c6e3302a59ae533034d8d75cfe05873ea40d0d05a03e15ae34101bb8a64722a7c6a6d43bb54b61033bc14af1542bb832a70ee7b1a2dab6dacb8ffd8f