diff options
| author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-04-23 23:11:27 -0300 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-04-23 23:11:27 -0300 |
| commit | 13671554adb3d9c5f37e85a9d3d66d5de47a888e (patch) | |
| tree | 8581c9003e06975c74d23dc5386f5775884ff8f1 /build-aux | |
| parent | 9fab861ea1669f2d9efb6d8fe222dc18f69c89f1 (diff) | |
| download | gnome-calendar-13671554adb3d9c5f37e85a9d3d66d5de47a888e.tar.gz | |
flatpak: Use host EDS
Let's try it again.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/flatpak/flatpak-wrapper.sh | 15 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Calendar.json | 27 |
2 files changed, 6 insertions, 36 deletions
diff --git a/build-aux/flatpak/flatpak-wrapper.sh b/build-aux/flatpak/flatpak-wrapper.sh deleted file mode 100755 index e44040c0..00000000 --- a/build-aux/flatpak/flatpak-wrapper.sh +++ /dev/null @@ -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 "$@" 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", @@ -148,22 +149,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", "sources" : [ |