[geary/gnome-3-32] Merge branch 'wip/nielsdg/folks-meson' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 08aaba15e194f87de430fc792358da8a22df348b
Author: Michael Gratton <mike vee net>
Date:   Wed Apr 17 22:48:15 2019 +0000

    Merge branch 'wip/nielsdg/folks-meson' into 'mainline'
    
    flatpak: Build folks with meson
    
    See merge request GNOME/geary!210
    
    (cherry picked from commit 4238994694a72b1fafd16d5b5cb50a87dc95e80e)
    
    1eb5dd10 flatpak: Build folks with meson

 org.gnome.Geary.json | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index c6a625e7..636ebb86 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -154,15 +154,14 @@
         },
         {
             "name": "folks",
+            "buildsystem": "meson",
             "cleanup": [
-                "/bin",
-                "/share/GConf"
+                "/bin"
             ],
             "config-opts": [
-                "--disable-telepathy-backend",
-                "--disable-inspect-tool",
-                "--disable-import-tool",
-                "--disable-fatal-warnings"
+                "-Dtelepathy_backend=false",
+                "-Dinspect_tool=false",
+                "-Dimport_tool=false"
             ],
             "sources": [
                 {