Update to 44.alpha

This commit is contained in:
Milan Crha 2023-01-09 09:52:04 +01:00
parent b692d2f960
commit de5f7834c2
3 changed files with 17 additions and 19 deletions

View File

@ -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);

View File

@ -20,13 +20,13 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$
Name: gnome-software
Version: 43.2
Version: 44~alpha
Release: 1%{?dist}
Summary: A software center for GNOME
License: GPL-2.0-or-later
URL: https://wiki.gnome.org/Apps/Software
Source0: https://download.gnome.org/sources/gnome-software/43/%{name}-%{tarball_version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-software/44/%{name}-%{tarball_version}.tar.xz
Patch01: 0001-crash-with-broken-theme.patch
@ -228,6 +228,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/gtk-doc/html/gnome-software/
%changelog
* Mon Jan 09 2023 Milan Crha <mcrha@redhat.com> - 44.alpha-1
- Update to 44.alpha
* Fri Dec 02 2022 Milan Crha <mcrha@redhat.com> - 43.2-1
- Update to 43.2

View File

@ -1 +1 @@
SHA512 (gnome-software-43.2.tar.xz) = d011418536706d2c5693581bd322008b5eb0fdf766ec96f1775135efb0fecec42dbc126ea2a66465b2169afb38b48fed1246516197e3bbf9d75b96e339d6ba33
SHA512 (gnome-software-44.alpha.tar.xz) = 4c6d71bca4c5f17d34b1d1c6083ade966ac0f43c9ae00fff1f05a51faca117647d71e48045ebbc697e1e4106dedfe45ce442973dad5f4a947c5dfe416232a776