[gnome-build-meta/jjardon/fdsdk-22.08rc.3: 6/6] Revert "core-deps/xdg-desktop-portal.bst: build 1.15.0 instead of reusing from freedesktop-sdk"




commit c4c998b6f562ad23a276b826149e6abc86804a0c
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Aug 24 10:42:45 2022 +0100

    Revert "core-deps/xdg-desktop-portal.bst: build 1.15.0 instead of reusing from freedesktop-sdk"
    
    This reverts commit dd004a7c466b3bc6ff9812d5224066eb9360e004.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1728>

 elements/core-deps/flatpak.bst            |  4 ++++
 elements/core-deps/xdg-desktop-portal.bst | 20 ++++++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index 0ceabb8be..5e2231233 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -30,6 +30,10 @@ depends:
 - freedesktop-sdk.bst:components/xorg-lib-xau.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
+runtime-depends:
+- core-deps/xdg-desktop-portal-gnome.bst
+- core-deps/xdg-desktop-portal-gtk.bst
+
 variables:
   conf-local: >-
     --with-system-bubblewrap
diff --git a/elements/core-deps/xdg-desktop-portal.bst b/elements/core-deps/xdg-desktop-portal.bst
index d37751360..8229075c0 100644
--- a/elements/core-deps/xdg-desktop-portal.bst
+++ b/elements/core-deps/xdg-desktop-portal.bst
@@ -1,20 +1,12 @@
-kind: meson
-
-sources:
-- kind: tar
-  url: github_files:flatpak/xdg-desktop-portal/releases/download/1.15.0/xdg-desktop-portal-1.15.0.tar.xz
+kind: filter
 
 build-depends:
-- core-deps/flatpak.bst
-- core-deps/libportal.bst
-- freedesktop-sdk.bst:components/xmlto.bst
-- freedesktop-sdk.bst:components/docbook-xsl.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+- freedesktop-sdk.bst:components/xdg-desktop-portal.bst
 
-depends:
-- core-deps/pipewire-daemon.bst
+runtime-depends:
 - sdk/geoclue.bst
 - sdk/glib.bst
+- core-deps/pipewire-daemon.bst
 - freedesktop-sdk.bst:components/fontconfig.bst
-- freedesktop-sdk.bst:components/fuse3.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
+- freedesktop-sdk.bst:components/xdg-desktop-portal-manifest.bst
+- freedesktop-sdk.bst:components/xdg-portal-interfaces.bst


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