[gnome-sdk-images/gnome-3-24] Use the new inherit-extensions feature of flatpak 0.9.6



commit 96fd7cff0f2eada829361477086362b32faea4aa
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Jun 20 15:45:35 2017 +0200

    Use the new inherit-extensions feature of flatpak 0.9.6
    
    This way each runtime doesn't have to be kept in sync with
    all the extensions of the parent.

 org.gnome.Sdk.json.in |   36 ++++++++----------------------------
 1 files changed, 8 insertions(+), 28 deletions(-)
---
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index bfcb45a..4335dc5 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -8,35 +8,15 @@
     "runtime-version": "@@SDK_RUNTIME_VERSION@@",
     "sdk-extensions": ["org.freedesktop.Sdk.Debug", "org.freedesktop.Sdk.Locale"],
     "platform-extensions": [ "org.freedesktop.Platform.Locale"],
+    "inherit-extensions": [
+        "org.freedesktop.Platform.GL",
+        "org.freedesktop.Platform.Timezones",
+        "org.freedesktop.Platform.GStreamer",
+        "org.freedesktop.Platform.Icontheme",
+        "org.freedesktop.Sdk.Extension",
+        "org.gtk.Gtk3theme"
+    ],
     "finish-args": [
-        "--extension=org.freedesktop.Platform.GL=directory=lib/GL",
-        "--extension=org.freedesktop.Platform.GL=version=1.4",
-        "--extension=org.freedesktop.Platform.GL=versions=1.6;1.4",
-        "--extension=org.freedesktop.Platform.GL=subdirectories=true",
-        "--extension=org.freedesktop.Platform.GL=no-autodownload=true",
-        "--extension=org.freedesktop.Platform.GL=autodelete=false",
-        "--extension=org.freedesktop.Platform.GL=add-ld-path=lib",
-        "--extension=org.freedesktop.Platform.GL=merge-dirs=vulkan/icd.d;glvnd/egl_vendor.d",
-        "--extension=org.freedesktop.Platform.GL=download-if=active-gl-driver",
-        "--extension=org.freedesktop.Platform.GL=enable-if=active-gl-driver",
-        "--extension=org.freedesktop.Platform.Timezones=directory=share/zoneinfo",
-        "--extension=org.freedesktop.Platform.Timezones=version=1.6",
-        "--extension=org.freedesktop.Platform.GStreamer=directory=lib/extensions/gstreamer-1.0",
-        "--extension=org.freedesktop.Platform.GStreamer=version=1.6",
-        "--extension=org.freedesktop.Platform.GStreamer=subdirectories",
-        "--extension=org.freedesktop.Platform.Icontheme=directory=share/runtime/share/icons",
-        "--extension=org.freedesktop.Platform.Icontheme=subdirectories=true",
-        "--extension=org.freedesktop.Platform.Icontheme=no-autodownload=true",
-        "--extension=org.freedesktop.Platform.Icontheme=version=1.0",
-        "--extension=org.freedesktop.Sdk.Extension=subdirectories",
-        "--extension=org.freedesktop.Sdk.Extension=directory=lib/sdk",
-        "--extension=org.freedesktop.Sdk.Extension=no-autodownload=true",
-        "--extension=org.freedesktop.Sdk.Extension=version=1.6",
-        "--extension=org.gtk.Gtk3theme=directory=share/runtime/share/themes",
-        "--extension=org.gtk.Gtk3theme=subdirectories=true",
-        "--extension=org.gtk.Gtk3theme=subdirectory-suffix=gtk-3.0",
-        "--extension=org.gtk.Gtk3theme=no-autodownload=true",
-        "--extension=org.gtk.Gtk3theme=version=3.22",
         "--env=GI_TYPELIB_PATH=/app/lib/girepository-1.0",
         
"--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/gstreamer-1.0",
         "--env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]