Hello community, here is the log from the commit of package gnome-software for openSUSE:Factory checked in at 2018-11-22 13:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-software (Old) and /work/SRC/openSUSE:Factory/.gnome-software.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-software" Thu Nov 22 13:22:51 2018 rev:59 rq:650342 version:3.30.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-software/gnome-software.changes 2018-11-06 14:00:49.851730652 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-software.new.19453/gnome-software.changes 2018-11-22 13:22:55.658162330 +0100 @@ -1,0 +2,7 @@ +Tue Nov 20 02:38:19 UTC 2018 - [email protected] + +- Add gnome-software-fix-installing-flatpakref.patch: flatpak: Fix + installing flatpakrefs if the remote is already configured + (glgo#GNOME/gnome-software#517). + +------------------------------------------------------------------- New: ---- gnome-software-fix-installing-flatpakref.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-software.spec ++++++ --- /var/tmp/diff_new_pack.ttPRuR/_old 2018-11-22 13:22:56.074161898 +0100 +++ /var/tmp/diff_new_pack.ttPRuR/_new 2018-11-22 13:22:56.078161893 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -25,6 +25,8 @@ Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/Software Source0: http://download.gnome.org/sources/gnome-software/3.30/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM glgo#GNOME/gnome-software#517 [email protected] -- flatpak: Fix installing flatpakrefs if the remote is already configured +Patch0: gnome-software-fix-installing-flatpakref.patch BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig ++++++ gnome-software-fix-installing-flatpakref.patch ++++++ >From 80a17dcf9cdcd2179b280e368f812524dafe6bae Mon Sep 17 00:00:00 2001 From: Kalev Lember <[email protected]> Date: Sat, 17 Nov 2018 21:59:31 +0100 Subject: [PATCH] flatpak: Fix installing flatpakrefs if the remote is already configured When we parse a flatpakref file and find that the remote for the app is already enabled, we try to show the app from the existing remote. This commit fixes this to actually work. The code was already there, but instead of returning the app from the existing remote, it short circuited the flatpakref loading and returned a half-loaded flatpakref GsApp that didn't have the associated runtime correctly set up, and things went downhill from there on. Fixes: https://gitlab.gnome.org/GNOME/gnome-software/issues/517 --- plugins/flatpak/gs-plugin-flatpak.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/flatpak/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c index d5435ecf..0792e89c 100644 --- a/plugins/flatpak/gs-plugin-flatpak.c +++ b/plugins/flatpak/gs-plugin-flatpak.c @@ -862,7 +862,7 @@ gs_plugin_flatpak_file_to_app_ref (GsPlugin *plugin, ref = gs_flatpak_app_get_ref_display (app); app_tmp = gs_plugin_flatpak_find_app_by_ref (plugin, ref, cancellable, NULL); if (app_tmp != NULL) - return g_steal_pointer (&app); + return g_steal_pointer (&app_tmp); /* force this to be 'any' scope for installation */ gs_app_set_scope (app, AS_APP_SCOPE_UNKNOWN); -- 2.19.1
