[gnome-build-meta/gnome-3-30] flatpak/{sdk, platform}: explicitly set the version for 18.08 freedesktop-sdk extensions



commit d6e01ce33389ece01496e74a1c1d1920cd9ea7e4
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Sep 27 20:05:25 2018 +0100

    flatpak/{sdk,platform}: explicitly set the version for 18.08 freedesktop-sdk extensions
    
    Fixes #73

 elements/flatpak/platform.bst | 8 ++++++--
 elements/flatpak/sdk.bst      | 9 ++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 084aac1..8e733a0 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -26,7 +26,8 @@ config:
 
     # Copied from sdk/elements/platform.bst from freedesktop-sdk because
     # bst doesn't support inheriting extensions.
-    # When syncing, skip the Locale extension
+    # When syncing, skip the Locale extension, and add the freedesktop-sdk
+    # version to extensions that don't have a version
     'Extension org.freedesktop.Platform.GL':
       versions: "18.08;1.6;1.4"
       version: "1.4"
@@ -41,10 +42,12 @@ config:
 
     'Extension org.freedesktop.Platform.Timezones':
       directory: "share/zoneinfo"
+      version: 18.08
 
     'Extension org.freedesktop.Platform.GStreamer':
       directory: "lib/extensions/gstreamer-1.0"
       subdirectories: "true"
+      version: 18.08
 
     'Extension org.freedesktop.Platform.Icontheme':
       directory: "share/runtime/share/icons"
@@ -64,9 +67,10 @@ config:
       autodelete: "false"
       no-autodownload: "true"
       download-if: "have-intel-gpu"
+      version: 18.08
 
     'Extension org.freedesktop.Platform.html5-codecs':
       directory: "%{lib}/ffmpeg"
       add-ld-path: "lib"
       autodelete: "false"
-
+      version: 18.08
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index f41f71f..008e6e7 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -37,7 +37,9 @@ config:
 
     # Copied from sdk/elements/sdk.bst from freedesktop-sdk because
     # bst doesn't support inheriting extensions
-    # When syncing, skip the Debug, Docs and Locale extensions
+    # When syncing, skip the Debug, Docs and Locale extensions, and
+    # add the freedesktop-sdk version to extensions that don't have
+    # a version.
     'Extension org.freedesktop.Platform.GL':
       versions: "18.08;1.6;1.4"
       version: "1.4"
@@ -52,10 +54,12 @@ config:
 
     'Extension org.freedesktop.Platform.Timezones':
       directory: "share/zoneinfo"
+      version: 18.08
 
     'Extension org.freedesktop.Platform.GStreamer':
       directory: "lib/extensions/gstreamer-1.0"
       subdirectories: "true"
+      version: 18.08
 
     'Extension org.freedesktop.Platform.Icontheme':
       directory: "share/runtime/share/icons"
@@ -74,15 +78,18 @@ config:
     'Extension org.freedesktop.Platform.html5-codecs':
       directory: "%{lib}/ffmpeg"
       add-ld-path: "lib"
+      version: 18.08
 
     'Extension org.freedesktop.Sdk.Extension':
       subdirectories: "true"
       directory: "lib/sdk"
       no-autodownload: "true"
       add-ld-path: "lib"
+      version: 18.08
 
     'Extension org.freedesktop.Platform.VAAPI.Intel':
       directory: "%{lib}/dri/intel-vaapi-driver"
       autodelete: "false"
       no-autodownload: "true"
       download-if: "have-intel-gpu"
+      version: 18.08


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