[gnome-builder/gnome-builder-3-36] fusermount: remove fusermount wrapper implementation

[Christian Hergert <chergert src gnome org>]

commit 1e2f2d2d96fcc60a5a14c338e45c80b013f29a99
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 18 14:22:38 2020 -0700

    fusermount: remove fusermount wrapper implementation
    
    We rely on this elsewhere in our flatpak manifest now.

 .gitlab-ci.yml                           |   1 -
 build-aux/flatpak/org.gnome.Builder.json |   1 -
 meson.build                              |   1 -
 meson_options.txt                        |   1 -
 src/fusermount-wrapper.c                 | 103 -------------------------------
 src/meson.build                          |  19 ------
 6 files changed, 126 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1822efb33..d9c8d9494 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,6 @@ flatpak:
         MESON_ARGS: |
           --buildtype=debugoptimized
           -Dctags_path=/app/bin/ctags
-          -Dfusermount_wrapper=true
           -Dtcmalloc=true
           -Dtracing=true
           -Dhelp=true
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index ddcb216ce..1134e1d9a 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -625,7 +625,6 @@
                 "--libdir=lib",
                 "--buildtype=debugoptimized",
                 "-Dctags_path=/app/bin/ctags",
-                "-Dfusermount_wrapper=true",
                 "-Dtcmalloc=true",
                 "-Dpython_libprefix=python3.7",
                 "-Dtracing=true",
diff --git a/meson.build b/meson.build
index 438bdb594..75db6b6ca 100644
--- a/meson.build
+++ b/meson.build
@@ -67,7 +67,6 @@ status += [
   '',
   'Tracing ............... : @0@'.format(get_option('tracing')),
   'Profiling ............. : @0@'.format(get_option('profiling')),
-  'fusermount ............ : @0@'.format(get_option('fusermount_wrapper')),
   'tcmalloc_minimal ...... : @0@'.format(get_option('tcmalloc')),
   '',
   'Help Docs ............. : @0@'.format(get_option('help')),
diff --git a/meson_options.txt b/meson_options.txt
index 1efc7c4ca..1c95c02e0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,5 @@
 option('tracing', type: 'boolean', value: false, description: 'Enable tracing of internals for 
troubleshooting Builder')
 option('profiling', type: 'boolean', value: false, description: 'Enable profiling of the Builder codebase')
-option('fusermount_wrapper', type: 'boolean', value: false, description: 'Install fusermount-wrapper when 
distributing with flatpak')
 option('tcmalloc', type: 'boolean', value: false, description: 'Use tcmalloc for dynamic allocations')
 
 option('with_safe_path', type: 'string', value: '', description: 'PATH variable to run build commands 
(default: platform-specific)')
diff --git a/src/meson.build b/src/meson.build
index 01554add7..494ca1653 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -76,25 +76,6 @@ if libsysprof_capture.found()
   gnome_builder_deps += libsysprof_capture
 endif
 
-if get_option('fusermount_wrapper')
-
-  executable('fusermount', ['fusermount-wrapper.c'],
-             gui_app: false,
-             install: true,
-         install_dir: get_option('bindir'),
-              c_args: exe_c_args + release_args,
-                 pie: true,
-       install_rpath: pkglibdir_abs,
-        dependencies: [libglib_dep],
-  )
-
-  install_data(['rofiles-fuse'],
-         install_dir: get_option('bindir'),
-        install_mode: 'rwxr-xr-x',
-  )
-
-endif
-
 gnome_builder = executable('gnome-builder', 'main.c', 'bug-buddy.c',
            gui_app: true,
            install: true,