[gnome-builder/gnome-builder-3-36] flatpak: bump libfuse and add fusermount wrapper

[Christian Hergert <chergert src gnome org>]

commit 5b8917475250f557f4041dbbf1713e9a9d1cf11d
Author: Christian Hergert <chergert redhat com>
Date:   Tue Mar 24 10:42:30 2020 -0700

    flatpak: bump libfuse and add fusermount wrapper
    
    This has been shipped as part of our stable tree for quite a while now,
    and somehow I missed backporting it to Nightly.
    
    Fixes #1175

 build-aux/flatpak/fusermount-wrapper.sh  |  9 +++++++++
 build-aux/flatpak/org.gnome.Builder.json | 11 +++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/build-aux/flatpak/fusermount-wrapper.sh b/build-aux/flatpak/fusermount-wrapper.sh
new file mode 100644
index 000000000..24bfa9dac
--- /dev/null
+++ b/build-aux/flatpak/fusermount-wrapper.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -z "$_FUSE_COMMFD" ]; then
+    FD_ARGS=
+else
+    FD_ARGS="--env=_FUSE_COMMFD=${_FUSE_COMMFD} --forward-fd=${_FUSE_COMMFD}"
+fi
+
+exec flatpak-spawn --host --forward-fd=1 --forward-fd=2 --forward-fd=3 $FD_ARGS fusermount "$@"
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 1134e1d9a..b418feb4c 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -119,11 +119,14 @@
             "cleanup" : [
                 "/bin/ulockmgr_server"
             ],
+            "post-install": [
+                "install -m a+rx fusermount-wrapper.sh /app/bin/fusermount"
+            ],
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : 
"https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz";,
-                    "sha256" : "832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874"
+                    "url" : 
"https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz";,
+                    "sha256" : "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5"
                 },
                 {
                     "type" : "patch",
@@ -132,6 +135,10 @@
                 {
                     "type" : "patch",
                     "path" : "fuse-disable-sys-mount-under-flatpak.patch"
+                },
+                {
+                    "type" : "file",
+                    "path" : "fusermount-wrapper.sh"
                 }
             ]
         },