$ git diff --patch-with-stat --summary 981f64eaff36be0bc9fde674e504edb1734cafbd..83a7ed124f145b5ba33ebdaa882e4d7c333e46fa
.abf.yml | 2 +-
0001-crash-with-broken-theme.patch | 27 +++++++++++----------------
gnome-software.spec | 11 ++++++-----
3 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index b5b0b37..6d55a34 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- gnome-software-43.3.tar.xz: fb3436f81086e0f655e9153c5ae8432f54d0630b
+ gnome-software-44.4.tar.xz: b4633f96914742dbb11295aadd3aab2bbeac953d
diff --git a/0001-crash-with-broken-theme.patch b/0001-crash-with-broken-theme.patch
index ddbef4a..d41a916 100644
--- a/0001-crash-with-broken-theme.patch
+++ b/0001-crash-with-broken-theme.patch
@@ -1,25 +1,20 @@
-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
-
-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
+diff -up gnome-software-devel/src/gs-feature-tile.c.1 gnome-software-devel/src/gs-feature-tile.c
+--- gnome-software-devel/src/gs-feature-tile.c.1 2023-01-02 17:08:54.157641969 +0100
++++ gnome-software-devel/src/gs-feature-tile.c 2023-01-02 17:09:36.881632780 +0100
+@@ -397,9 +397,6 @@ gs_feature_tile_refresh (GsAppTile *self
if (key_colors != tile->key_colors_cache) {
g_autoptr(GArray) colors = NULL;
GdkRGBA fg_rgba;
+-#if !GTK_CHECK_VERSION(4, 9, 2)
- gboolean fg_rgba_valid;
+-#endif
GsHSBC fg_hsbc;
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.
- */
+@@ -424,8 +421,17 @@ gs_feature_tile_refresh (GsAppTile *self
+ gtk_widget_get_color (GTK_WIDGET (self), &fg_rgba);
+ #else
+ context = gtk_widget_get_style_context (GTK_WIDGET (self));
- fg_rgba_valid = gtk_style_context_lookup_color (context, "theme_fg_color", &fg_rgba);
- g_assert (fg_rgba_valid);
+ if (!gtk_style_context_lookup_color (context, "theme_fg_color", &fg_rgba)) {
@@ -33,6 +28,6 @@ diff -up gnome-software-42.rc/src/gs-feature-tile.c.1 gnome-software-42.rc/src/g
+ fg_rgba.blue = 0.0;
+ fg_rgba.alpha = 1.0;
+ }
+ #endif
gtk_rgb_to_hsv (fg_rgba.red, fg_rgba.green, fg_rgba.blue,
- &fg_hsbc.hue, &fg_hsbc.saturation, &fg_hsbc.brightness);
diff --git a/gnome-software.spec b/gnome-software.spec
index 548b549..1e45182 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -3,14 +3,14 @@
# don't provide plugin .so
%global __provides_exclude_from %{_libdir}/gs-plugins-3/.*\\.so
-%global plugin_major 19
+%global plugin_major 20
#define _disable_ld_no_undefined 1
#define _disable_lto 1
Summary: A software center for GNOME
Name: gnome-software
-Version: 43.3
+Version: 44.4
Release: 1
License: GPLv2+
Group: Graphical desktop/GNOME
@@ -20,7 +20,8 @@ Source0: https://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version
Patch01: 0001-crash-with-broken-theme.patch
-BuildRequires: appstream
+BuildRequires: appstream < 1.0.0
+BuildRequires: appstream = 0.16.2
BuildRequires: cmake
BuildRequires: gettext
BuildRequires: gtk-doc
@@ -28,7 +29,7 @@ BuildRequires: intltool
BuildRequires: xsltproc
BuildRequires: docbook-style-xsl
BuildRequires: desktop-file-utils
-BuildRequires: pkgconfig(appstream)
+BuildRequires: pkgconfig(appstream) = 0.16.2
BuildRequires: pkgconfig(appstream-glib) >= 0.2.4
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gtk4)
@@ -86,7 +87,7 @@ export CC=gcc
export CXX=g++
# Fix build error on GCC after linker switch to LDD.
-%global ldflags %{ldflags} -fuse-ld=gold
+#global ldflags %{ldflags} -fuse-ld=gold
# Fix build error at i686 with gcc and gold.
%ifarch %{ix86}
%global ldflags %{ldflags} -Wl,-z,notext