[evolution/gnome-3-30] [Flatpak] Use host system DConf to store user settings

[Milan Crha <mcrha src gnome org>]

commit 1dbbdd5e9528f64808c31eaff21ff63d8a23e6fb
Author: Milan Crha <mcrha redhat com>
Date:   Thu Oct 4 12:52:50 2018 +0200

    [Flatpak] Use host system DConf to store user settings
    
    This requires https://gitlab.gnome.org/GNOME/evolution-data-server/commit/c3ead7b6f7

 flatpak/org.gnome.Evolution-master.json | 26 +++++---------------------
 flatpak/org.gnome.Evolution-stable.json | 26 +++++---------------------
 2 files changed, 10 insertions(+), 42 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index 159c73402e..e85c7ba885 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -27,6 +27,10 @@
                "--socket=x11",
                "--socket=wayland",
                "--socket=pulseaudio",
+               "--filesystem=xdg-run/dconf",
+               "--filesystem=~/.config/dconf:ro",
+               "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+               "--talk-name=ca.desrt.dconf",
                "--talk-name=org.freedesktop.Notifications",
                "--talk-name=org.freedesktop.portal.Desktop",
                "--talk-name=org.gnome.OnlineAccounts"
@@ -168,26 +172,6 @@
                        ]
                },
 
-               {
-                       "name": "dconf",
-                       "config-opts": [
-                               "--disable-gtk-doc",
-                               "--disable-man"
-                       ],
-                       "cleanup": [
-                               "/share/bash-completion",
-                               "/share/gtk-doc",
-                               "/share/vala"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/dconf/0.26/dconf-0.26.0.tar.xz";,
-                                       "sha256": 
"8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9"
-                               }
-                       ]
-               },
-
                {
                        "name": "gnome-keyring",
                        "rm-configure": true,
@@ -307,7 +291,6 @@
                                        "commands": [
                                                "export GIO_USE_NETWORK_MONITOR=base",
                                                "echo evolution-flatpak | /app/bin/gnome-keyring-daemon 
--daemonize --unlock &",
-                                               "/app/libexec/dconf-service &",
                                                "sleep 1",
                                                "gsettings reset org.gnome.evolution-data-server 
network-monitor-gio-name",
                                                "/app/libexec/evolution-source-registry &",
@@ -327,6 +310,7 @@
                                                "/app/libexec/evolution-data-server/evolution-dbus-session 
\\",
                                                "       --exec /app/bin/evolution-wrapper \\",
                                                "       --service-dir /app/share/dbus-1/services/ \\",
+                                               "       --iface ca.desrt.dconf:/ca/desrt/dconf \\",
                                                "       --iface 
org.freedesktop.Notifications:/org/freedesktop/Notifications \\",
                                                "       --iface 
org.freedesktop.portal.Desktop:/org/freedesktop/portal/desktop \\",
                                                "       --iface 
org.gnome.OnlineAccounts:/org/gnome/OnlineAccounts"
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 7e86ab3a75..c4f8781f77 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -26,6 +26,10 @@
                "--socket=x11",
                "--socket=wayland",
                "--socket=pulseaudio",
+               "--filesystem=xdg-run/dconf",
+               "--filesystem=~/.config/dconf:ro",
+               "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+               "--talk-name=ca.desrt.dconf",
                "--talk-name=org.freedesktop.Notifications",
                "--talk-name=org.freedesktop.portal.Desktop",
                "--talk-name=org.gnome.OnlineAccounts"
@@ -167,26 +171,6 @@
                        ]
                },
 
-               {
-                       "name": "dconf",
-                       "config-opts": [
-                               "--disable-gtk-doc",
-                               "--disable-man"
-                       ],
-                       "cleanup": [
-                               "/share/bash-completion",
-                               "/share/gtk-doc",
-                               "/share/vala"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/dconf/0.26/dconf-0.26.0.tar.xz";,
-                                       "sha256": 
"8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9"
-                               }
-                       ]
-               },
-
                {
                        "name": "gnome-keyring",
                        "rm-configure": true,
@@ -306,7 +290,6 @@
                                        "commands": [
                                                "export GIO_USE_NETWORK_MONITOR=base",
                                                "echo evolution-flatpak | /app/bin/gnome-keyring-daemon 
--daemonize --unlock &",
-                                               "/app/libexec/dconf-service &",
                                                "sleep 1",
                                                "gsettings reset org.gnome.evolution-data-server 
network-monitor-gio-name",
                                                "/app/libexec/evolution-source-registry &",
@@ -326,6 +309,7 @@
                                                "/app/libexec/evolution-data-server/evolution-dbus-session 
\\",
                                                "       --exec /app/bin/evolution-wrapper \\",
                                                "       --service-dir /app/share/dbus-1/services/ \\",
+                                               "       --iface ca.desrt.dconf:/ca/desrt/dconf \\",
                                                "       --iface 
org.freedesktop.Notifications:/org/freedesktop/Notifications \\",
                                                "       --iface 
org.freedesktop.portal.Desktop:/org/freedesktop/portal/desktop \\",
                                                "       --iface 
org.gnome.OnlineAccounts:/org/gnome/OnlineAccounts"