[gnome-todo] flatpak: Run EDS nested to the sandbox

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 2adb24b3ece30b62b1a63d9391aaa4412399a574
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Feb 1 11:56:35 2019 -0200

    flatpak: Run EDS nested to the sandbox
    
    EDS keeps changing its D-Bus API and we can't really
    rely on it matching the host. Thus, make EDS run nested
    to the sandbox.

 build-aux/flatpak/flatpak-wrapper.sh  | 15 +++++++
 build-aux/flatpak/org.gnome.Todo.json | 76 ++++++++++++++++++++++-------------
 2 files changed, 63 insertions(+), 28 deletions(-)
---
diff --git a/build-aux/flatpak/flatpak-wrapper.sh b/build-aux/flatpak/flatpak-wrapper.sh
new file mode 100755
index 0000000..a307ccb
--- /dev/null
+++ b/build-aux/flatpak/flatpak-wrapper.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [ "$1" = "--quit" -o "$1" = "-q" ]; then
+    /app/bin/gnome-todo "$@"
+    exit
+fi
+
+export GIO_USE_NETWORK_MONITOR=base
+gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
+/app/libexec/evolution-source-registry &
+sleep 1
+/app/libexec/evolution-addressbook-factory -r &
+/app/libexec/evolution-calendar-factory -r &
+sleep 1
+/app/bin/gnome-todo "$@"
diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
index 54fe77f..b3fe02d 100644
--- a/build-aux/flatpak/org.gnome.Todo.json
+++ b/build-aux/flatpak/org.gnome.Todo.json
@@ -3,7 +3,7 @@
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
-    "command" : "gnome-todo",
+    "command" : "flatpak-wrapper.sh",
     "tags" : [
         "devel"
     ],
@@ -17,10 +17,6 @@
         "--system-talk-name=org.freedesktop.login1",
         "--talk-name=org.gnome.OnlineAccounts",
         "--talk-name=org.gnome.SettingsDaemon.Color",
-        "--talk-name=org.gnome.evolution.dataserver.AddressBook9",
-        "--talk-name=org.gnome.evolution.dataserver.Calendar7",
-        "--talk-name=org.gnome.evolution.dataserver.Sources5",
-        "--talk-name=org.gnome.evolution.dataserver.Subprocess.Backend.*",
         "--filesystem=host",
         "--filesystem=xdg-run/dconf",
         "--filesystem=~/.config/dconf:ro",
@@ -74,6 +70,32 @@
                 }
             ]
         },
+        {
+            "name" : "libpeas",
+            "cleanup" : [
+                "/bin/*",
+                "/lib/peas-demo"
+            ],
+            "config-opts" : [
+                "-disable-gtk"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/libpeas.git";
+                }
+            ]
+        },
+        {
+            "name" : "rest",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "branch" : "librest-0-7",
+                    "url" : "https://gitlab.gnome.org/GNOME/librest.git";
+                }
+            ]
+        },
         {
             "name" : "evolution-data-server",
             "cleanup" : [
@@ -83,10 +105,12 @@
                 "/share/dbus-1/services"
             ],
             "config-opts" : [
+                "-DDBUS_SERVICES_PREFIX=org.gnome.Todo",
+                "-DENABLE_DOT_LOCKING=OFF",
+                "-DENABLE_FILE_LOCKING=fcntl",
                 "-DENABLE_GTK=OFF",
-                "-DENABLE_GOOGLE_AUTH=OFF",
-                "-DENABLE_UOA=OFF",
                 "-DENABLE_GOOGLE=OFF",
+                "-DENABLE_UOA=OFF",
                 "-DENABLE_VALA_BINDINGS=ON",
                 "-DENABLE_WEATHER=OFF",
                 "-DWITH_OPENLDAP=OFF",
@@ -97,9 +121,11 @@
                 "-DENABLE_EXAMPLES=OFF",
                 "-DENABLE_VALA_BINDINGS=OFF",
                 "-DENABLE_INTROSPECTION=OFF",
+                "-DWITH_PHONENUMBER=OFF",
+                "-DWITH_SYSTEMDUSERUNITDIR=OFF",
                 "-DENABLE_OAUTH2=OFF"
             ],
-            "buildsystem" : "cmake",
+            "buildsystem" : "cmake-ninja",
             "sources" : [
                 {
                     "type" : "git",
@@ -108,29 +134,19 @@
             ]
         },
         {
-            "name" : "libpeas",
-            "cleanup" : [
-                "/bin/*",
-                "/lib/peas-demo"
-            ],
-            "config-opts" : [
-                "-disable-gtk"
+            "name" : "flatpak-wrapper",
+            "buildsystem" : "simple",
+            "build-commands" : [
             ],
             "sources" : [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libpeas.git";
-                }
-            ]
-        },
-        {
-            "name" : "rest",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "branch" : "librest-0-7",
-                    "url" : "https://gitlab.gnome.org/GNOME/librest.git";
+                    "type" : "file",
+                    "path" : "flatpak-wrapper.sh"
                 }
+            ],
+            "post-install" : [
+                "mkdir -p /app/bin",
+                "install -C flatpak-wrapper.sh /app/bin/flatpak-wrapper.sh"
             ]
         },
         {
@@ -146,5 +162,9 @@
                 }
             ]
         }
-    ]
+    ],
+    "build-options" : {
+        "env" : {
+        }
+    }
 }