From d00ff84ad82e5dd619a86243489c3d22bdddaadb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 19 Feb 2015 22:31:27 +0100 Subject: [PATCH] Backport a crash fix --- ...-Fix-a-crash-when-reloading-the-page.patch | 55 +++++++++++++++++++ gnome-software.spec | 7 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0001-extras-Fix-a-crash-when-reloading-the-page.patch diff --git a/0001-extras-Fix-a-crash-when-reloading-the-page.patch b/0001-extras-Fix-a-crash-when-reloading-the-page.patch new file mode 100644 index 0000000..d0c4e1f --- /dev/null +++ b/0001-extras-Fix-a-crash-when-reloading-the-page.patch @@ -0,0 +1,55 @@ +From 02ae8c3193aa6bdd459fdf5382a48f38d83ae33e Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 19 Feb 2015 22:22:46 +0100 +Subject: [PATCH] extras: Fix a crash when reloading the page + +Make gs_shell_extras_reload() a noop when we have no contents for the +page. + +Thanks to Rafal Luzynski for spotting this! +--- + src/gs-shell-extras.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gs-shell-extras.c b/src/gs-shell-extras.c +index cdd8211..474bf27 100644 +--- a/src/gs-shell-extras.c ++++ b/src/gs-shell-extras.c +@@ -721,7 +721,8 @@ gs_shell_extras_load (GsShellExtras *shell_extras, GPtrArray *array_search_data) + void + gs_shell_extras_reload (GsShellExtras *shell_extras) + { +- gs_shell_extras_load (shell_extras, NULL); ++ if (priv->array_search_data != NULL) ++ gs_shell_extras_load (shell_extras, NULL); + } + + static void +-- +2.3.0 + +From fae08193f7e4eb1f9930bdca2d856683660e8c74 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 19 Feb 2015 22:32:57 +0100 +Subject: [PATCH] Fix the build + +--- + src/gs-shell-extras.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gs-shell-extras.c b/src/gs-shell-extras.c +index 474bf27..349a788 100644 +--- a/src/gs-shell-extras.c ++++ b/src/gs-shell-extras.c +@@ -721,6 +721,8 @@ gs_shell_extras_load (GsShellExtras *shell_extras, GPtrArray *array_search_data) + void + gs_shell_extras_reload (GsShellExtras *shell_extras) + { ++ GsShellExtrasPrivate *priv = shell_extras->priv; ++ + if (priv->array_search_data != NULL) + gs_shell_extras_load (shell_extras, NULL); + } +-- +2.3.0 + diff --git a/gnome-software.spec b/gnome-software.spec index b1a5736..3bc09eb 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -7,7 +7,7 @@ Summary: A software center for GNOME Name: gnome-software Version: 3.15.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://wiki.gnome.org/Apps/Software @@ -15,6 +15,7 @@ Source0: http://download.gnome.org/sources/gnome-software/3.15/%{name}-%{versi # Downstream patch to the list of unremovable system apps Patch0: gnome-software-system-apps.patch +Patch1: 0001-extras-Fix-a-crash-when-reloading-the-page.patch Requires: appstream-data %if 0%{?fedora} @@ -51,6 +52,7 @@ and update software in the GNOME desktop. %prep %setup -q %patch0 -p1 -b .system-apps +%patch1 -p1 %build %configure --disable-static @@ -109,6 +111,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-software/modulesets.d/*.xml %changelog +* Thu Feb 19 2015 Kalev Lember - 3.15.90-2 +- Backport a crash fix + * Tue Feb 17 2015 Richard Hughes - 3.15.90-1 - Update to 3.15.90