[gnome-calendar] flatpak: Use host EDS

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

commit 13671554adb3d9c5f37e85a9d3d66d5de47a888e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Apr 23 23:11:27 2019 -0300

    flatpak: Use host EDS
    
    Let's try it again.

 build-aux/flatpak/flatpak-wrapper.sh      | 15 ---------------
 build-aux/flatpak/org.gnome.Calendar.json | 27 ++++++---------------------
 2 files changed, 6 insertions(+), 36 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Calendar.json b/build-aux/flatpak/org.gnome.Calendar.json
index 45d9004d..397f70b5 100644
--- a/build-aux/flatpak/org.gnome.Calendar.json
+++ b/build-aux/flatpak/org.gnome.Calendar.json
@@ -3,7 +3,7 @@
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
-    "command" : "flatpak-wrapper.sh",
+    "command" : "gnome-calendar",
     "tags" : [
         "devel"
     ],
@@ -11,12 +11,16 @@
     "finish-args" : [
         "--share=ipc",
         "--share=network",
-        "--socket=x11",
+        "--socket=fallback-x11",
         "--socket=wayland",
         "--system-talk-name=org.freedesktop.login1",
         "--system-talk-name=org.freedesktop.GeoClue2",
         "--talk-name=ca.desrt.dconf",
         "--talk-name=org.gnome.ControlCenter",
+        "--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.*",
         "--talk-name=org.gnome.OnlineAccounts",
         "--talk-name=org.gnome.SettingsDaemon.Color",
         "--filesystem=home",
@@ -109,12 +113,9 @@
             "cleanup": [ "/share/GConf" ],
             "buildsystem" : "cmake-ninja",
             "config-opts" : [
-                "-DDBUS_SERVICES_PREFIX=org.gnome.Calendar",
                 "-DENABLE_DOT_LOCKING=OFF",
                 "-DENABLE_FILE_LOCKING=fcntl",
                 "-DENABLE_GTK=ON",
-                "-DENABLE_GOOGLE_AUTH=OFF",
-                "-DENABLE_UOA=OFF",
                 "-DENABLE_GOOGLE=OFF",
                 "-DENABLE_VALA_BINDINGS=OFF",
                 "-DENABLE_WEATHER=OFF",
@@ -147,22 +148,6 @@
                 }
             ]
         },
-        {
-            "name" : "flatpak-wrapper",
-            "buildsystem" : "simple",
-            "build-commands" : [
-            ],
-            "sources" : [
-                {
-                    "type" : "file",
-                    "path" : "flatpak-wrapper.sh"
-                }
-            ],
-            "post-install" : [
-                "mkdir -p /app/bin",
-                "install -C flatpak-wrapper.sh /app/bin/flatpak-wrapper.sh"
-            ]
-        },
         {
             "name" : "gnome-calendar",
             "buildsystem" : "meson",