flatpak: Use host EDS

Let's try it again.
This commit is contained in:
Georges Basile Stavracas Neto
2019-04-23 23:11:27 -03:00
parent 9fab861ea1
commit 13671554ad
2 changed files with 6 additions and 36 deletions
-15
View File
@@ -1,15 +0,0 @@
#!/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 "$@"
+6 -21
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" : "flatpak-wrapper.sh", "command" : "gnome-calendar",
"tags" : [ "tags" : [
"devel" "devel"
], ],
@@ -11,12 +11,16 @@
"finish-args" : [ "finish-args" : [
"--share=ipc", "--share=ipc",
"--share=network", "--share=network",
"--socket=x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--system-talk-name=org.freedesktop.login1", "--system-talk-name=org.freedesktop.login1",
"--system-talk-name=org.freedesktop.GeoClue2", "--system-talk-name=org.freedesktop.GeoClue2",
"--talk-name=ca.desrt.dconf", "--talk-name=ca.desrt.dconf",
"--talk-name=org.gnome.ControlCenter", "--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.OnlineAccounts",
"--talk-name=org.gnome.SettingsDaemon.Color", "--talk-name=org.gnome.SettingsDaemon.Color",
"--filesystem=home", "--filesystem=home",
@@ -109,12 +113,9 @@
"cleanup": [ "/share/GConf" ], "cleanup": [ "/share/GConf" ],
"buildsystem" : "cmake-ninja", "buildsystem" : "cmake-ninja",
"config-opts" : [ "config-opts" : [
"-DDBUS_SERVICES_PREFIX=org.gnome.Calendar",
"-DENABLE_DOT_LOCKING=OFF", "-DENABLE_DOT_LOCKING=OFF",
"-DENABLE_FILE_LOCKING=fcntl", "-DENABLE_FILE_LOCKING=fcntl",
"-DENABLE_GTK=ON", "-DENABLE_GTK=ON",
"-DENABLE_GOOGLE_AUTH=OFF",
"-DENABLE_UOA=OFF",
"-DENABLE_GOOGLE=OFF", "-DENABLE_GOOGLE=OFF",
"-DENABLE_VALA_BINDINGS=OFF", "-DENABLE_VALA_BINDINGS=OFF",
"-DENABLE_WEATHER=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", "name" : "gnome-calendar",
"buildsystem" : "meson", "buildsystem" : "meson",