Update to 42.rc

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
+diff -up gnome-software-42.rc/src/gs-feature-tile.c.1 gnome-software-42.rc/src/gs-feature-tile.c
-index 1c85083eb..158af1e56 100644
+--- gnome-software-42.rc/src/gs-feature-tile.c.1	2022-03-04 16:23:58.566735700 +0100
---- a/src/gs-feature-tile.c
++++ gnome-software-42.rc/src/gs-feature-tile.c	2022-03-07 08:06:29.046595524 +0100
-+++ b/src/gs-feature-tile.c
+@@ -411,7 +411,6 @@ gs_feature_tile_refresh (GsAppTile *self
-@@ -268,7 +268,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;
- 
+ 			const GsHSBC *chosen_hsbc;
- 			/* Look up the foreground colour for the feature tile,
+ 			GsHSBC chosen_hsbc_modified;
-@@ -283,8 +282,17 @@ gs_feature_tile_refresh (GsAppTile *self)
+@@ -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-packagekit-crash-on-app-install.patch

@@ -1,28 +0,0 @@
-From 73d1c9fd58d2fdf2c2d84e70cce678390679baa9 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 16 Feb 2022 15:01:46 +0100
-Subject: [PATCH] PackageKit: Fix a crash on app install
-
-The array should be NULL-terminated, thus add the NULL at the end.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1648
----
- plugins/packagekit/gs-plugin-packagekit.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/packagekit/gs-plugin-packagekit.c b/plugins/packagekit/gs-plugin-packagekit.c
-index 1ad913af5..56ddb1ccc 100644
---- a/plugins/packagekit/gs-plugin-packagekit.c
-+++ b/plugins/packagekit/gs-plugin-packagekit.c
-@@ -612,6 +612,8 @@ gs_plugin_app_install (GsPlugin *plugin,
- 			return FALSE;
- 		}
- 
-+		g_ptr_array_add (array_package_ids, NULL);
-+
- 		gs_app_set_state (app, GS_APP_STATE_INSTALLING);
- 
- 		for (i = 0; i < gs_app_list_length (addons); i++) {
--- 
-GitLab
-

0003-workaround-gsapprow-gtk_widget_measure-error-flood.patch

@@ -1,39 +0,0 @@
-diff -up gnome-software-42.beta/src/gs-app-row.ui.3 gnome-software-42.beta/src/gs-app-row.ui
---- gnome-software-42.beta/src/gs-app-row.ui.3	2022-02-10 20:53:14.109477000 +0100
-+++ gnome-software-42.beta/src/gs-app-row.ui	2022-02-16 17:49:02.583817963 +0100
-@@ -26,7 +26,7 @@
-             <property name="valign">center</property>
-             <child>
-               <object class="GtkLabel" id="name_label">
--                <property name="wrap">True</property>
-+                <property name="wrap">False</property>
-                 <property name="xalign">0.0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="ellipsize">end</property>
-@@ -80,7 +80,7 @@
-                     <property name="visible">False</property>
-                     <property name="xalign">0.0</property>
-                     <property name="yalign">0.5</property>
--                    <property name="wrap">True</property>
-+                    <property name="wrap">False</property>
-                     <property name="wrap-mode">word-char</property>
-                     <property name="ellipsize">end</property>
-                     <property name="lines">2</property>
-@@ -119,7 +119,7 @@
-                 <property name="vexpand">True</property>
-                 <property name="margin_start">24</property>
-                 <property name="margin_end">24</property>
--                <property name="wrap">True</property>
-+                <property name="wrap">False</property>
-                 <property name="wrap-mode">word-char</property>
-                 <property name="ellipsize">end</property>
-                 <property name="lines">2</property>
-@@ -187,7 +187,7 @@
-                     <property name="visible">False</property>
-                     <property name="label">warning-text</property>
-                     <property name="halign">start</property>
--                    <property name="wrap">True</property>
-+                    <property name="wrap">False</property>
-                     <property name="xalign">0</property>
-                     <attributes>
-                       <attribute name="weight" value="bold"/>

gnome-software.spec

@@ -12,8 +12,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:      gnome-software
-Version:   42~beta
+Version:   42~rc
-Release:   3%{?dist}
+Release:   1%{?dist}
 Summary:   A software center for GNOME
 
 License:   GPLv2+
@@ -21,8 +21,6 @@ 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-packagekit-crash-on-app-install.patch
-Patch03:   0003-workaround-gsapprow-gtk_widget_measure-error-flood.patch
 
 BuildRequires: appstream-devel >= %{appstream_version}
 BuildRequires: gcc
@@ -178,7 +176,7 @@ 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
+%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop
 %{_datadir}/app-info/xmls/org.gnome.Software.Featured.xml
 %{_datadir}/app-info/xmls/org.gnome.Software.Popular.xml
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
@@ -200,6 +198,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc/html/gnome-software
 
 %changelog
+* Mon Mar 07 2022 Milan Crha <mcrha@redhat.com> - 42.rc-1
+- Update to 42.rc
+
 * Mon Feb 21 2022 Milan Crha <mcrha@redhat.com> - 42.beta-3
 - Resolves: #2056082 (Enable PackageKit autoremove option)
 

sources

@@ -1 +1 @@
-SHA512 (gnome-software-42.beta.tar.xz) = 3ae22c9a37a134a6340191aabc7b02f6b53322820853aacd36e6d43893d7118d177defff44de93b627e488411798570b9c82c99b354966a899563e27d8c32a6a
+SHA512 (gnome-software-42.rc.tar.xz) = cd9c465d73b8998c0ebc49d5e40fec22522e0f125cbce5ff59a7a13d779a3793ac57dfb606d9b918e0c198b6b6cd62657483dc8e83a77ed84966c5f44980f38b