rpms/gnome-software
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport crasher fix from upstream (RHBZ #1444669 / BGO #781217)

Browse Source
This commit is contained in:
Adam Williamson 2017-04-25 18:26:01 -07:00
parent e69f67450b
commit a0fe24526b
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Do-not-abort-if-a-page-does-not-handle-the-reload-vf.patch Normal file
View File

@ -0,0 +1,27 @@
From e813ae525a536eb2f6765c8cfb975eb6ba10bdfe Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 13 Apr 2017 17:43:13 +0100
Subject: [PATCH] Do not abort if a page does not handle the reload vfunc
---
src/gs-page.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gs-page.c b/src/gs-page.c
index 6614eb46..818adf60 100644
--- a/src/gs-page.c
+++ b/src/gs-page.c
@@ -646,8 +646,8 @@ gs_page_reload (GsPage *page)
GsPageClass *klass;
g_return_if_fail (GS_IS_PAGE (page));
klass = GS_PAGE_GET_CLASS (page);
- g_assert (klass->reload != NULL);
- klass->reload (page);
+ if (klass->reload != NULL)
+ klass->reload (page);
}
gboolean
--
2.12.2

11
gnome-software.spec
View File

@ -14,12 +14,16 @@
Name: gnome-software
Version: 3.24.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A software center for GNOME
License: GPLv2+
URL: https://wiki.gnome.org/Apps/Software
Source0: https://download.gnome.org/sources/gnome-software/3.24/%{name}-%{version}.tar.xz
# Backport from upstream master:
# https://git.gnome.org/browse/gnome-software/commit/?id=e813ae525a536eb2f6765c8cfb975eb6ba10bdfe
# Should fix RHBZ #1444669 / BGO #781217
Patch0: 0001-Do-not-abort-if-a-page-does-not-handle-the-reload-vf.patch
BuildRequires: gettext
BuildRequires: libxslt
@ -82,7 +86,7 @@ These development files are for building gnome-software plugins outside
the source tree. Most users do not need this subpackage installed.
%prep
%setup -q
%autosetup -p1
%build
%configure \
@ -208,6 +212,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/gtk-doc/html/gnome-software
%changelog
* Tue Apr 25 2017 Adam Williamson <awilliam@redhat.com> - 3.24.1-2
- Backport crasher fix from upstream (RHBZ #1444669 / BGO #781217)
* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> - 3.24.1-1
- Update to 3.24.1