[gnome-builder/gnome-builder-3-40] flatpak: handle incorrect ref in SDK extensions

[Christian Hergert <chergert src gnome org>]

commit d6d64958262c3c20452bf82e890120499981906b
Author: Christian Hergert <chergert redhat com>
Date:   Thu Apr 22 12:15:02 2021 -0700

    flatpak: handle incorrect ref in SDK extensions
    
    This fixes an issue where an extension might say that it extends a runtime
    for an architecture other than the architecture it advertises as its
    runtime.
    
    Notably, org.freedesktop.Sdk.Compat.i386/x86_64/19.08 says that it is an
    extension of ref=runtime/org.freedesktop.Sdk/i386/19.08 which can't be the
    case (since it's x86_64).
    
    Fixes #1437

 .../flatpak/gbp-flatpak-application-addin.c        | 42 ++++++++++++++++++----
 1 file changed, 36 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c 
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index a8e32eb37..8400a8e9b 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -1611,17 +1611,47 @@ gbp_flatpak_application_addin_resolve_extension (GbpFlatpakApplicationAddin *sel
                   g_autofree gchar *version = NULL;
                   g_autofree gchar *runtime = NULL;
                   g_autofree gchar *match = NULL;
+                  g_autofree gchar *refstr = NULL;
 
                   /* This might be our extension */
                   if (ide_str_equal0 (group, "ExtensionOf") &&
-                      ide_str_equal0 (id, extension) &&
-                      (runtime = g_key_file_get_string (keyfile, group, "runtime", NULL)))
+                      ide_str_equal0 (id, extension))
                     {
-                      ResolveExtension re = {
-                        chunk_insert (strings, "%s/%s/%s", id, arch, branch),
-                        g_string_chunk_insert_const (strings, runtime) };
+                      runtime = g_key_file_get_string (keyfile, group, "runtime", NULL);
+                      refstr = g_key_file_get_string (keyfile, group, "ref", NULL);
 
-                      g_array_append_val (maybe_extention_of, re);
+                      if (ref != NULL && g_str_has_prefix (refstr, "runtime/"))
+                        {
+                          g_autofree gchar *ref_id = NULL;
+                          g_autofree gchar *ref_arch = NULL;
+                          g_autofree gchar *ref_branch = NULL;
+
+                          if (gbp_flatpak_split_id (refstr + strlen ("runtime/"), &ref_id, &ref_arch, 
&ref_branch))
+                            {
+                              g_clear_pointer (&runtime, g_free);
+
+                              /* https://gitlab.gnome.org/GNOME/gnome-builder/issues/1437
+                               *
+                               * Some extensions report an incorrect ref (or a ref that is
+                               * for another architecture than the current). For example,
+                               * org.freedesktop.Sdk.Compat.i386/x86_64/19.08 will report
+                               * a ref of org.freedesktop.Sdk/i386/19.08.
+                               *
+                               * To work around this, we can simply swap the arch for the
+                               * arch of the runtime extension we're looking at.
+                               */
+                              runtime = g_strdup_printf ("%s/%s/%s", ref_id, arch, ref_branch);
+                            }
+                        }
+
+                      if (runtime != NULL)
+                        {
+                          ResolveExtension re = {
+                            chunk_insert (strings, "%s/%s/%s", id, arch, branch),
+                            g_string_chunk_insert_const (strings, runtime) };
+
+                          g_array_append_val (maybe_extention_of, re);
+                        }
                     }
 
                   /* This might provide the extension */