File 0007-dir-Use-ExtensionOf.runtime-for-apply_extra.patch of Package flatpak.25785

From 4b7963f5b1c303d4a9d2e21afdfdf5338841b93c Mon Sep 17 00:00:00 2001
From: Ryan Gonzalez <rymg19@gmail.com>
Date: Mon, 10 Jun 2019 19:38:52 +0000
Subject: [PATCH] dir: Use ExtensionOf.runtime for apply_extra

Closes: #2954
Approved by: alexlarsson

(cherry picked from commit 9cd682b057206de8596bdba6303a0414207ef621)

Closes: #2992
Approved by: alexlarsson

(cherry picked from commit cdc8d2deb5567727c2adaa0f962cba75ab86ac1a)

Closes: #3115
Approved by: alexlarsson
---
 common/flatpak-dir.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 1e2fae4c9..3dcfd6e4c 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -6743,6 +6743,9 @@ apply_extra_data (FlatpakDir   *self,
 
   runtime = g_key_file_get_string (metakey, group,
                                    FLATPAK_METADATA_KEY_RUNTIME, error);
+  if (runtime == NULL)
+    runtime = g_key_file_get_string (metakey, FLATPAK_METADATA_GROUP_EXTENSION_OF,
+                                     FLATPAK_METADATA_KEY_RUNTIME, NULL);
   if (runtime == NULL)
     return FALSE;