rpm/gnome-software
SHA256
1
0
Fork 0
forked from pool/gnome-software
Code Pull Requests Activity

Accepting request 975076 from GNOME:Factory

Browse Source 
(forwarded request 974418 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/975076
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-software?expand=0&rev=92
This commit is contained in:
Dominique Leuenberger 2022-05-06 16:58:12 +00:00 committed by Git OBS Bridge
commit 21e077dee0
5 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
8cbce25.patch
View File

@ -1,33 +0,0 @@
From 8cbce258c3ed1e581477ce56972c9ce9c6225aa5 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Mon, 28 Mar 2022 11:32:10 +0100
Subject: [PATCH] gs-update-monitor: Ignore G_IO_ERROR_CANCELLED for historical
updates
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
Helps: #1693
---
src/gs-update-monitor.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c
index a8d3e014c..bf7dbf683 100644
--- a/src/gs-update-monitor.c
+++ b/src/gs-update-monitor.c
@@ -1125,6 +1125,12 @@ get_updates_historical_cb (GObject *object, GAsyncResult *res, gpointer data)
/* get result */
apps = gs_plugin_loader_job_process_finish (GS_PLUGIN_LOADER (object), res, &error);
if (apps == NULL) {
+ if (g_error_matches (error, GS_PLUGIN_ERROR, GS_PLUGIN_ERROR_CANCELLED) ||
+ g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_debug ("Failed to get historical updates: %s", error->message);
+ g_clear_error (&monitor->last_offline_error);
+ return;
+ }
/* save this in case the user clicks the
* 'Show Details' button from the notification below */
--
GitLab

3
gnome-software-42.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42c685e2ef79962eb30a8e958c703c9a1f3df731504223a0628b3b624ef7dc1e
size 2266316

3
gnome-software-42.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f5b89a2193124b421f3c7235433b3ff5fda081a950daca3a3ebc5bfaf25fc70d
size 2261664

26
gnome-software.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Fri Apr 29 12:01:13 UTC 2022 - Emily Gonyer <emilyyrose@gmail.com>
- Updated to version 42.1:
+ #1514 GNOME OS: Most system apps have no icons in installed
list.
+ #1690 Button to go back is missing in "OS Updates" page opened
from "Installed Updates" window.
+ #1693 Fix an issue where Software would sometimes display a
"Software Updates Failed" error message on startup.
+ #1712 Clicking "Fedora Flathub Selection" does not update the
filtered Flathub AppStream metadata until reboot.
+ #1723 Installed Updates dialog UI papercuts.
+ #1727 Wrong direction of arrows in updates list in RTL
languages.
+ !794 flatpak: Prefer to install runtimes from the same remote
as the application.
+ !1235 Find AppStream metadata in every possible location.
+ !1299 Avoid re-downloads of not-yet-stale data in some cases.
+ !1307 Change thread I/O priority depending on job priority.
+ !1313 Ensure labels don't overlap in app lists.
+ !1318 Fix an issue preventing the user from disabling some
repositories on Fedora.
+ Translation updates.
- Drop 8cbce25.patch - patched upstream, #1693.
-------------------------------------------------------------------
Fri Apr 8 11:39:59 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

20
gnome-software.spec
View File

@ -19,7 +19,7 @@
%define gs_plugin_api 17
Name: gnome-software
Version: 42.0
Version: 42.1
Release: 0
Summary: GNOME Software Store
License: GPL-2.0-or-later
@ -30,8 +30,6 @@ Source0: https://download.gnome.org/sources/gnome-software/42/%{name}-%{v
# PATCH-FIX-OPENSUSE gnome-software-launch-gpk-update-viewer-for-updates.patch bsc#1077332 boo#1090042 sckang@suse.com -- Don't launch gnome-software when clicking the updates notification. Launch gpk-update-viewer instead.
Patch0: gnome-software-launch-gpk-update-viewer-for-updates.patch
%endif
# PATCH-FIX-UPSTREAM 8cbce25.patch dimstar@opensuse.org -- Fix repeating notification "Software updates failed"
Patch1: https://gitlab.gnome.org/GNOME/gnome-software/-/commit/8cbce25.patch
BuildRequires: gtk-doc
BuildRequires: meson >= 0.47.0
@ -113,10 +111,6 @@ mv %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop %{buildro
%license COPYING
%doc NEWS README.md
%{_bindir}/%{name}
%dir %{_datadir}/app-info
%dir %{_datadir}/app-info/xmls
%{_datadir}/app-info/xmls/org.gnome.Software.Featured.xml
%{_datadir}/app-info/xmls/org.gnome.Software.Popular.xml
%{_datadir}/metainfo/org.gnome.Software.appdata.xml
%{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
%{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
@ -130,15 +124,19 @@ mv %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop %{buildro
%{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini
%{_datadir}/icons/hicolor/*/*/*.svg
%dir %{_libdir}/gnome-software
%dir %{_libdir}/gnome-software/plugins-%{gs_plugin_api}
%{_libdir}/gnome-software/libgnomesoftware.so.%{gs_plugin_api}
%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/*.so
%{_libexecdir}/gnome-software-cmd
%{_libexecdir}/gnome-software-restarter
%{_mandir}/man1/%{name}.1%{?ext_man}
#%%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop
%{_distconfdir}/xdg/autostart/org.gnome.Software.desktop
%dir %{_libdir}/gnome-software/plugins-18/
%{_libdir}/gnome-software/plugins-18/*.so
%{_libdir}/gnome-software/libgnomesoftware.so.18
%dir %{_datadir}/swcatalog/
%dir %{_datadir}/swcatalog/xml/
%{_datadir}/swcatalog/xml/org.gnome.Software.Featured.xml
%{_datadir}/swcatalog/xml/org.gnome.Software.Popular.xml
%files devel
%doc AUTHORS
%dir %{_includedir}/%{name}