File gnome-builder-flatpak-use-proper-sdk-name.patch of Package gnome-builder

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-builder-flatpak-use-proper-sdk-name.patch of Package gnome-builder (Revision a654cbe2e6709438fde8828722977d2a)

Currently displaying revision a654cbe2e6709438fde8828722977d2a , Show latest

diff --git a/plugins/flatpak/gbp-flatpak-pipeline-addin.c b/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index 6654cb8..7586871 100644
--- a/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -109,12 +109,12 @@ register_build_init_stage (GbpFlatpakPipelineAddin  *self,
   g_autoptr(IdeSubprocessLauncher) launcher = NULL;
   g_autoptr(IdeBuildStage) stage = NULL;
   g_autofree gchar *staging_dir = NULL;
+  g_autofree gchar *sdk = NULL;
   g_autofree gchar *metadata_path = NULL;
   IdeConfiguration *config;
   IdeRuntime *runtime;
   const gchar *app_id;
   const gchar *platform;
-  const gchar *sdk;
   const gchar *branch;
   guint stage_id;
 
@@ -139,7 +139,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin  *self,
   staging_dir = gbp_flatpak_get_staging_dir (config);
   app_id = ide_configuration_get_app_id (config);
   platform = gbp_flatpak_runtime_get_platform (GBP_FLATPAK_RUNTIME (runtime));
-  sdk = gbp_flatpak_runtime_get_sdk (GBP_FLATPAK_RUNTIME (runtime));
+  sdk = gbp_flatpak_runtime_get_sdk_name (GBP_FLATPAK_RUNTIME (runtime));
   branch = gbp_flatpak_runtime_get_branch (GBP_FLATPAK_RUNTIME (runtime));
 
   if (platform == NULL && sdk == NULL)
@@ -155,7 +155,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin  *self,
     platform = sdk;
 
   if (sdk == NULL)
-    sdk = platform;
+    sdk = g_strdup (platform);
 
   metadata_path = g_build_filename (staging_dir, "metadata", NULL);

diff --git a/plugins/flatpak/gbp-flatpak-runtime.c b/plugins/flatpak/gbp-flatpak-runtime.c
index d9facc2..70bf391 100644
--- a/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/plugins/flatpak/gbp-flatpak-runtime.c
@@ -454,6 +454,24 @@ gbp_flatpak_runtime_get_sdk (GbpFlatpakRuntime *self)
   return self->sdk;
 }
 
+gchar *
+gbp_flatpak_runtime_get_sdk_name (GbpFlatpakRuntime *self)
+{
+  const gchar *slash;
+
+  g_return_val_if_fail (GBP_IS_FLATPAK_RUNTIME (self), NULL);
+
+  if (self->sdk == NULL)
+    return NULL;
+
+  slash = strchr (self->sdk, '/');
+
+  if (slash == NULL)
+    return g_strdup (self->sdk);
+  else
+    return g_strndup (self->sdk, slash - self->sdk);
+}
+
 void
 gbp_flatpak_runtime_set_sdk (GbpFlatpakRuntime *self,
                              const gchar       *sdk)
diff --git a/plugins/flatpak/gbp-flatpak-runtime.h b/plugins/flatpak/gbp-flatpak-runtime.h
index 4c11080..7834f42 100644
--- a/plugins/flatpak/gbp-flatpak-runtime.h
+++ b/plugins/flatpak/gbp-flatpak-runtime.h
@@ -39,6 +39,7 @@ const gchar         *gbp_flatpak_runtime_get_arch     (GbpFlatpakRuntime    *sel
 const gchar         *gbp_flatpak_runtime_get_branch   (GbpFlatpakRuntime    *self);
 const gchar         *gbp_flatpak_runtime_get_platform (GbpFlatpakRuntime    *self);
 const gchar         *gbp_flatpak_runtime_get_sdk      (GbpFlatpakRuntime    *self);
+gchar               *gbp_flatpak_runtime_get_sdk_name (GbpFlatpakRuntime    *self);
 
 G_END_DECLS

Places

File gnome-builder-flatpak-use-proper-sdk-name.patch of Package gnome-builder (Revision a654cbe2e6709438fde8828722977d2a)

Places