[gnome-build-meta/abderrahim/xdg-portal: 1/2] core-deps/xdg-desktop-portal.bst: build 1.15.0 instead of reusing from freedesktop-sdk




commit dd004a7c466b3bc6ff9812d5224066eb9360e004
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Aug 13 18:48:48 2022 +0100

    core-deps/xdg-desktop-portal.bst: build 1.15.0 instead of reusing from freedesktop-sdk
    
    also drop xdg-desktop-portal from flatpak runtime-depends to avoid circular dependency
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1719>

 elements/core-deps/flatpak.bst            |  4 ----
 elements/core-deps/xdg-desktop-portal.bst | 20 ++++++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index 5e2231233..0ceabb8be 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -30,10 +30,6 @@ 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 8229075c0..d37751360 100644
--- a/elements/core-deps/xdg-desktop-portal.bst
+++ b/elements/core-deps/xdg-desktop-portal.bst
@@ -1,12 +1,20 @@
-kind: filter
+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
 
 build-depends:
-- freedesktop-sdk.bst:components/xdg-desktop-portal.bst
+- 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
 
-runtime-depends:
+depends:
+- core-deps/pipewire-daemon.bst
 - sdk/geoclue.bst
 - sdk/glib.bst
-- core-deps/pipewire-daemon.bst
 - freedesktop-sdk.bst:components/fontconfig.bst
-- freedesktop-sdk.bst:components/xdg-desktop-portal-manifest.bst
-- freedesktop-sdk.bst:components/xdg-portal-interfaces.bst
+- freedesktop-sdk.bst:components/fuse3.bst
+- freedesktop-sdk.bst:bootstrap-import.bst


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