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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 7a97ce77c23075ed9b4f2be8facf537b0454624d
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Nov 24 15:06:04 2019 -0600

    Revert "core-deps: add flatpak and build gnome-software with the flatpak backend"
    
    This reverts commit 2a1dd9792110288077985f10a3b9f11b8c572430.
    
    It depends on unreleased gnome-software.

 elements/core-deps/flatpak.bst         | 27 ---------------------------
 elements/core-deps/ostree.bst          | 26 --------------------------
 elements/core/gnome-software.bst       |  2 +-
 elements/world.bst                     |  1 +
 elements/{core-deps => world}/fuse.bst |  6 +-----
 5 files changed, 3 insertions(+), 59 deletions(-)
---
diff --git a/elements/core/gnome-software.bst b/elements/core/gnome-software.bst
index 2a6d9d7e..eaabe058 100644
--- a/elements/core/gnome-software.bst
+++ b/elements/core/gnome-software.bst
@@ -8,7 +8,6 @@ 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
@@ -27,4 +26,5 @@ depends:
 variables:
   meson-local: >-
     -Dfwupd=false
+    -Dflatpak=false
     -Dvalgrind=false
diff --git a/elements/world.bst b/elements/world.bst
index ae7be5d2..f2480274 100644
--- a/elements/world.bst
+++ b/elements/world.bst
@@ -12,6 +12,7 @@ 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
diff --git a/elements/core-deps/fuse.bst b/elements/world/fuse.bst
similarity index 76%
rename from elements/core-deps/fuse.bst
rename to elements/world/fuse.bst
index fe78fe9c..d8722a7f 100644
--- a/elements/core-deps/fuse.bst
+++ b/elements/world/fuse.bst
@@ -1,16 +1,12 @@
 kind: autotools
-
 sources:
 - kind: tar
-  url: github_com:libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
+  url: github_com:libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.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}'