[gnome-build-meta] Revert "Revert "core-deps: add flatpak and build gnome-software with the flatpak backend""

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 9b2a79644906c5744ad6562b89b28e55a1a90a54
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Nov 25 15:30:01 2019 +0000

    Revert "Revert "core-deps: add flatpak and build gnome-software with the flatpak backend""
    
    This reverts commit 7a97ce77c23075ed9b4f2be8facf537b0454624d

 elements/core-deps/flatpak.bst         | 27 +++++++++++++++++++++++++++
 elements/{world => core-deps}/fuse.bst |  6 +++++-
 elements/core-deps/ostree.bst          | 26 ++++++++++++++++++++++++++
 elements/core/gnome-software.bst       |  2 +-
 elements/world.bst                     |  1 -
 5 files changed, 59 insertions(+), 3 deletions(-)
---
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
new file mode 100644
index 00000000..e3fa43c1
--- /dev/null
+++ b/elements/core-deps/flatpak.bst
@@ -0,0 +1,27 @@
+kind: autotools
+
+sources:
+- kind: tar
+  url: github_com:flatpak/flatpak/releases/download/1.4.3/flatpak-1.4.3.tar.xz
+
+build-depends:
+- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/bison.bst
+- freedesktop-sdk.bst:components/git.bst
+- freedesktop-sdk.bst:components/libxslt.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
+depends:
+- core-deps/fuse.bst
+- core-deps/ostree.bst
+- core-deps/polkit.bst
+- sdk/appstream-glib.bst
+- sdk/json-glib.bst
+- sdk/libsoup.bst
+- freedesktop-sdk.bst:components/gpgme.bst
+- freedesktop-sdk.bst:components/libarchive.bst
+- freedesktop-sdk.bst:components/libcap.bst
+- freedesktop-sdk.bst:components/libseccomp.bst
+- freedesktop-sdk.bst:components/libxml2.bst
+- freedesktop-sdk.bst:components/xorg-lib-xau.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/fuse.bst b/elements/core-deps/fuse.bst
similarity index 76%
rename from elements/world/fuse.bst
rename to elements/core-deps/fuse.bst
index d8722a7f..fe78fe9c 100644
--- a/elements/world/fuse.bst
+++ b/elements/core-deps/fuse.bst
@@ -1,12 +1,16 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: github_com:libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz
+  url: github_com:libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
 - kind: patch
   path: files/fuse/fuse-kernel-h-clean-includes.patch
+
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
+
 environment:
   MOUNT_FUSE_PATH: '%{sbindir}'
diff --git a/elements/core-deps/ostree.bst b/elements/core-deps/ostree.bst
new file mode 100644
index 00000000..7625fb2c
--- /dev/null
+++ b/elements/core-deps/ostree.bst
@@ -0,0 +1,26 @@
+kind: autotools
+
+sources:
+- kind: tar
+  url: github_com:ostreedev/ostree/releases/download/v2019.4/libostree-2019.4.tar.xz
+
+build-depends:
+- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/bison.bst
+- freedesktop-sdk.bst:components/git.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
+depends:
+- core-deps/fuse.bst
+- sdk/glib.bst
+- sdk/libsoup.bst
+- freedesktop-sdk.bst:components/e2fsprogs.bst
+- freedesktop-sdk.bst:components/gpgme.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - "%{libdir}/libostree.so"
diff --git a/elements/core/gnome-software.bst b/elements/core/gnome-software.bst
index eaabe058..2a6d9d7e 100644
--- a/elements/core/gnome-software.bst
+++ b/elements/core/gnome-software.bst
@@ -8,6 +8,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/PackageKit.bst
+- core-deps/flatpak.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gspell.bst
 - core-deps/libgudev.bst
@@ -26,5 +27,4 @@ depends:
 variables:
   meson-local: >-
     -Dfwupd=false
-    -Dflatpak=false
     -Dvalgrind=false
diff --git a/elements/world.bst b/elements/world.bst
index f2480274..ae7be5d2 100644
--- a/elements/world.bst
+++ b/elements/world.bst
@@ -12,7 +12,6 @@ depends:
 - world/evolution.bst
 - world/five-or-more.bst
 - world/four-in-a-row.bst
-- world/fuse.bst
 - world/ghex.bst
 - world/gitg.bst
 - world/glade.bst