[gnome-apps-nightly/gnome-3-22] Builder: add support for flatpak inside of flatpak

[Christian Hergert <chergert src gnome org>]

commit 7dc29297be056a5d88a5cde2b71118d44c03dd04
Author: Christian Hergert <chergert redhat com>
Date:   Thu Sep 22 11:57:44 2016 -0700

    Builder: add support for flatpak inside of flatpak
    
    This brings over the flatpak support inside of flatpak that was added
    to gnome-apps-nightly master branch. It also includes tags so that we
    are locked to a given version of libgsystem/ostree/flatpak.

 org.gnome.Builder.json |   61 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index c916cfc..fed91cc 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -18,7 +18,9 @@
         /* Needs to talk to the network: */
         "--share=network",
         "--talk-name=org.gtk.vfs.*",
+        /* Needs access to policykit for flatpak and sysprof */
         "--system-talk-name=org.freedesktop.PolicyKit1",
+        /* Needs access to host sysprofd for profiling */
         "--system-talk-name=org.gnome.Sysprof2",
         /* Needed for dconf to work (+ host or homedir read access from above) */
         "--filesystem=xdg-run/dconf",
@@ -31,12 +33,14 @@
         "--env=SSL_CERT_DIR=/etc/ssl/certs",
         "--env=SSL_CERT_FILE=/etc/ssl/cert.pem",
         "--filesystem=/etc/ssl:ro",
-        "--filesystem=/etc/ca-certificates:ro"
+        "--filesystem=/etc/ca-certificates:ro",
+        "--filesystem=/var/lib/flatpak"
     ],
     "build-options" : {
         "cflags": "-O2 -g",
         "cxxflags": "-O2 -g",
         "env": {
+            "MOUNT_FUSE_PATH": "../tmp/",
             "V": "1"
         }
     },
@@ -47,6 +51,61 @@
                 "*.la", "*.a"],
     "modules": [
         {
+            "name": "libfuse",
+            "cleanup": [ "/bin" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": 
"https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/fuse-2.9.5.tar.gz";,
+                    "sha256": "579f371cc5ffc1afca7057512bf7d52988a9ede57859a7c55e5b9f72435cdbb5"
+                }
+            ]
+        },
+        {
+            "name": "libgsystem",
+            "sources": [
+                {
+                    "type": "git",
+                    "branch": "d606bec68ddfea78de4b03c3f3568afb71bdc1ce",
+                    "url": "git://git.gnome.org/libgsystem.git"
+                }
+            ]
+        },
+        {
+            "name": "ostree",
+            "config-opts": [ "--disable-man" ],
+            "cleanup": [ "/bin", "/etc/grub.d", "/libexec" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "branch": "73eabca5e853385df0cd81dd0f685904f9a20c3d",
+                    "url": "https://github.com/ostreedev/ostree.git";
+                }
+            ]
+        },
+        {
+            "name": "flatpak",
+            "config-opts": [ "--disable-documentation",
+                             "--disable-seccomp",
+                             "--disable-sandboxed-triggers",
+                             "--disable-system-helper" ],
+            "cleanup": [ "/etc/profile.d",
+                         "/libexec",
+                         "/lib/systemd",
+                         "/share/dbus-1/interfaces/org.freedesktop.*",
+                         "/share/dbus-1/services/org.freedesktop.*",
+                         "/share/gdm" ],
+            "post-install": [ "cp /usr/bin/update-mime-database /app/bin",
+                              "cp /usr/bin/update-desktop-database /app/bin" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "branch": "cb180540a68da556254baf9019ad752438d53865",
+                    "url": "https://github.com/alexlarsson/flatpak.git";
+                }
+            ]
+        },
+        {
             "name": "polkit",
             "config-opts": [ "--disable-polkitd", "--disable-man-pages", "--disable-introspection" ],
             "rm-configure": true,