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.
This commit is contained in:
Georges Basile Stavracas Neto
2019-02-01 13:31:56 -02:00
parent 2e684a6288
commit 0580637772
2 changed files with 36 additions and 6 deletions
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
if [ "$1" = "--quit" -o "$1" = "-q" ]; then
/app/bin/gnome-calendar "$@"
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-calendar "$@"
+21 -6
View File
@@ -3,7 +3,7 @@
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version" : "master", "runtime-version" : "master",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"command" : "gnome-calendar", "command" : "flatpak-wrapper.sh",
"tags" : [ "tags" : [
"devel" "devel"
], ],
@@ -18,10 +18,6 @@
"--talk-name=ca.desrt.dconf", "--talk-name=ca.desrt.dconf",
"--talk-name=org.gnome.ControlCenter", "--talk-name=org.gnome.ControlCenter",
"--talk-name=org.gnome.OnlineAccounts", "--talk-name=org.gnome.OnlineAccounts",
"--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.SettingsDaemon.Color", "--talk-name=org.gnome.SettingsDaemon.Color",
"--filesystem=home", "--filesystem=home",
"--filesystem=xdg-run/dconf", "--filesystem=xdg-run/dconf",
@@ -116,8 +112,11 @@
"/libexec", "/libexec",
"/share/dbus-1/services" "/share/dbus-1/services"
], ],
"buildsystem" : "cmake", "buildsystem" : "cmake-ninja",
"config-opts" : [ "config-opts" : [
"-DDBUS_SERVICES_PREFIX=org.gnome.Calendar",
"-DENABLE_DOT_LOCKING=OFF",
"-DENABLE_FILE_LOCKING=fcntl",
"-DENABLE_GTK=ON", "-DENABLE_GTK=ON",
"-DENABLE_GOOGLE_AUTH=OFF", "-DENABLE_GOOGLE_AUTH=OFF",
"-DENABLE_UOA=OFF", "-DENABLE_UOA=OFF",
@@ -153,6 +152,22 @@
} }
] ]
}, },
{
"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", "name" : "gnome-calendar",
"buildsystem" : "meson", "buildsystem" : "meson",