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

Accepting request 650309 from home:JonathanKang:branches:GNOME:Factory

Browse Source 
- Add gnome-software-fix-installing-flatpakref.patch: flatpak: Fix
  installing flatpakrefs if the remote is already configured
  (glgo#GNOME/gnome-software#517).

OBS-URL: https://build.opensuse.org/request/show/650309
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=152
This commit is contained in:
Dominique Leuenberger 2018-11-20 08:55:35 +00:00 committed by Git OBS Bridge
parent 97d3bfe0a0
commit 97e5b0b6d2
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnome-software-fix-installing-flatpakref.patch Normal file
View File

@ -0,0 +1,37 @@
From 80a17dcf9cdcd2179b280e368f812524dafe6bae Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
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

7
gnome-software.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Nov 20 02:38:19 UTC 2018 - sckang@suse.com
- Add gnome-software-fix-installing-flatpakref.patch: flatpak: Fix
installing flatpakrefs if the remote is already configured
(glgo#GNOME/gnome-software#517).
-------------------------------------------------------------------
Wed Oct 24 14:11:40 UTC 2018 - bjorn.lie@gmail.com

4
gnome-software.spec
View File

@ -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 @@ License: GPL-2.0-or-later
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 sckang@suse.com -- flatpak: Fix installing flatpakrefs if the remote is already configured
Patch0: gnome-software-fix-installing-flatpakref.patch
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: pkgconfig