diff --git a/0001-crash-with-broken-theme.patch b/0001-crash-with-broken-theme.patch deleted file mode 100644 index d41a916..0000000 --- a/0001-crash-with-broken-theme.patch +++ /dev/null @@ -1,33 +0,0 @@ -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; -@@ -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)) { -+ static gboolean i_know = FALSE; -+ if (!i_know) { -+ i_know = TRUE; -+ g_warning ("The theme doesn't provide 'theme_fg_color', fallbacking to black"); -+ } -+ fg_rgba.red = 0.0; -+ fg_rgba.green = 0.0; -+ fg_rgba.blue = 0.0; -+ fg_rgba.alpha = 1.0; -+ } - #endif - - gtk_rgb_to_hsv (fg_rgba.red, fg_rgba.green, fg_rgba.blue, diff --git a/gnome-software.spec b/gnome-software.spec index 090dad5..fe6943e 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -2,10 +2,9 @@ %global flatpak_version 1.5.1 %global fwupd_version 1.3.3 %global glib2_version 2.61.1 -%global gtk4_version 4.4.0 +%global gtk4_version 4.9.2 %global json_glib_version 1.2.0 -%global libadwaita_version 1.0.1 -%global libsoup_version 2.52.0 +%global libadwaita_version 1.3.alpha %global libxmlb_version 0.1.7 %global packagekit_version 1.1.1 @@ -13,23 +12,21 @@ %{!?with_webapps: %global with_webapps !0%{?rhel}} # this is not a library version -%define gs_plugin_version 19 +%define gs_plugin_version 20 %global tarball_version %%(echo %{version} | tr '~' '.') %global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$ Name: gnome-software -Version: 44~alpha -Release: 2%{?dist} +Version: 44.5 +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/44/%{name}-%{tarball_version}.tar.xz -Patch01: 0001-crash-with-broken-theme.patch - BuildRequires: docbook-style-xsl BuildRequires: desktop-file-utils BuildRequires: gcc @@ -76,7 +73,6 @@ Requires: json-glib%{?_isa} >= %{json_glib_version} Requires: iso-codes # librsvg2 is needed for gdk-pixbuf svg loader Requires: librsvg2%{?_isa} -Requires: libsoup%{?_isa} >= %{libsoup_version} Requires: libxmlb%{?_isa} >= %{libxmlb_version} Recommends: PackageKit%{?_isa} >= %{packagekit_version} @@ -151,6 +147,7 @@ official-repos = [ 'rhel-%{?rhel}' ] %else official-repos = [ 'anaconda', 'fedora', 'fedora-debuginfo', 'fedora-source', 'koji-override-0', 'koji-override-1', 'rawhide', 'rawhide-debuginfo', 'rawhide-source', 'updates', 'updates-debuginfo', 'updates-source', 'updates-testing', 'updates-testing-debuginfo', 'updates-testing-source', 'fedora-modular', 'fedora-modular-debuginfo', 'fedora-modular-source', 'rawhide-modular', 'rawhide-modular-debuginfo', 'rawhide-modular-source', 'fedora-cisco-openh264', 'fedora-cisco-openh264-debuginfo' ] required-repos = [ 'fedora', 'updates' ] +packaging-format-preference = [ 'flatpak:fedora-testing', 'flatpak:fedora', 'rpm' ] %endif FOE @@ -228,6 +225,39 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/gtk-doc/html/gnome-software/ %changelog +* Fri Sep 15 2023 Milan Crha - 44.5-1 +- Update to 44.5 + +* Fri Aug 04 2023 Milan Crha - 44.4-1 +- Update to 44.4 + +* Fri Jun 30 2023 Milan Crha - 44.3-1 +- Update to 44.3 + +* Fri May 26 2023 Milan Crha - 44.2-1 +- Update to 44.2 + +* Fri Apr 21 2023 Milan Crha - 44.1-1 +- Update to 44.1 + +* Sun Mar 26 2023 Yaakov Selkowitz - 44.0-3 +- Fix libsoup runtime dependency + +* Fri Mar 24 2023 Milan Crha - 44.0-2 +- Resolves: #2181367 (Prefer Fedora Flatpaks before RPM before other sources for apps) + +* Fri Mar 17 2023 Milan Crha - 44.0-1 +- Update to 44.0 + +* Fri Mar 03 2023 Milan Crha - 44~rc-1 +- Update to 44.rc + +* Thu Feb 23 2023 Adam Williamson - 44~beta-2 +- Backport MR #1635 to fix update notifications + +* Tue Feb 14 2023 Milan Crha - 44.beta-1 +- Update to 44.beta + * Thu Jan 19 2023 Fedora Release Engineering - 44~alpha-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 15996c7..4ec277a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-44.alpha.tar.xz) = 4c6d71bca4c5f17d34b1d1c6083ade966ac0f43c9ae00fff1f05a51faca117647d71e48045ebbc697e1e4106dedfe45ce442973dad5f4a947c5dfe416232a776 +SHA512 (gnome-software-44.5.tar.xz) = 8fa90a6ff5543a0eaeee9039de5fcbd5a272ae972fc2ae5e349c5a00871e83ebde405adf9f83bcd1b489838011f011058a275cc9cd5bab33b8e525a4044d090b