[gnome-software/gnome-3-22] Support installing flatpakrepo files without optional fields

[Kalev Lember <klember src gnome org>]

commit 3d7ed3f6ebfa5e84429e78041e090b5096f156e4
Author: Richard Hughes <richard hughsie com>
Date:   Wed Oct 12 11:12:35 2016 +0100

    Support installing flatpakrepo files without optional fields
    
    Don't (mis)use the homepage property to store the flatpak URL. This worked for
    some files where Homepage=Url but not in the case where they differed or where
    the optional Homepage was missing.
    
    Resolves: https://bugzilla.gnome.org/show_bug.cgi?id=772788
    (cherry picked from commit 31f6bea19b4ed9c35e57a3dd657bef9e729bbf4b)

 src/plugins/gs-flatpak.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/plugins/gs-flatpak.c b/src/plugins/gs-flatpak.c
index 99e91ce..785b933 100644
--- a/src/plugins/gs-flatpak.c
+++ b/src/plugins/gs-flatpak.c
@@ -794,8 +794,8 @@ gs_flatpak_app_install_source (GsFlatpak *self, GsApp *app,
 
        /* create a new remote */
        xremote = flatpak_remote_new (gs_app_get_id (app));
+       flatpak_remote_set_url (xremote, gs_app_get_metadata_item (app, "flatpak::url"));
        flatpak_remote_set_noenumerate (xremote, FALSE);
-       flatpak_remote_set_url (xremote, gs_app_get_url (app, AS_URL_KIND_HOMEPAGE));
        if (gs_app_get_summary (app) != NULL)
                flatpak_remote_set_title (xremote, gs_app_get_summary (app));
 
@@ -2204,6 +2204,7 @@ gs_flatpak_file_to_app_repo (GsFlatpak *self,
        gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
        gs_app_set_name (app, GS_APP_QUALITY_NORMAL, repo_title);
        gs_app_set_metadata (app, "flatpak::gpg-key", repo_gpgkey);
+       gs_app_set_metadata (app, "flatpak::url", repo_url);
        gs_app_set_origin_hostname (app, repo_url);
        gs_app_set_management_plugin (app, gs_plugin_get_name (self->plugin));