[evolution] Update Flatpak build scripts to better integrate with the host desktop
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update Flatpak build scripts to better integrate with the host desktop
- Date: Wed, 12 Sep 2018 11:55:56 +0000 (UTC)
commit 02c364d4810464f37ac2f52a70be8f949102816a
Author: Milan Crha <mcrha redhat com>
Date: Mon Sep 3 11:22:36 2018 +0200
Update Flatpak build scripts to better integrate with the host desktop
With the evolution-dbus-session (provided by evolution-data-server),
the Flatpak version of Evolution can talk to the host system D-Bus
session and be better integrated with the host desktop.
flatpak/org.gnome.Evolution-master.json | 34 +++++++++++++++++++++++++++++----
flatpak/org.gnome.Evolution-stable.json | 34 +++++++++++++++++++++++++++++----
2 files changed, 60 insertions(+), 8 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index affb9132ff..94307c21f5 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -26,7 +26,10 @@
"--share=network",
"--socket=x11",
"--socket=wayland",
- "--socket=pulseaudio"
+ "--socket=pulseaudio",
+ "--talk-name=org.freedesktop.Notifications",
+ "--talk-name=org.freedesktop.portal.Desktop",
+ "--talk-name=org.gnome.OnlineAccounts"
],
"modules": [
{
@@ -60,6 +63,19 @@
]
},
+ {
+ "name": "gnome-online-accounts",
+ "config-opts": [ "--disable-Werror", "--disable-telepathy",
"--disable-documentation", "--disable-backend" ],
+ "cleanup": [ "/bin", "/share/GConf" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://download.gnome.org/sources/gnome-online-accounts/3.28/gnome-online-accounts-3.28.0.tar.xz",
+ "sha256":
"87bc4ef307604f1ce4f09f6e5c9996ef8d37ca5e0a3bf76f6b27d71844adb40c"
+ }
+ ]
+ },
+
{
"name": "libgdata",
"config-opts": [
@@ -227,15 +243,16 @@
"config-opts": [
"-DENABLE_FILE_LOCKING=fcntl",
"-DENABLE_DOT_LOCKING=OFF",
- "-DENABLE_GOOGLE_AUTH=ON",
+ "-DENABLE_OAUTH2=ON",
"-DENABLE_GTK=ON",
"-DENABLE_UOA=OFF",
- "-DENABLE_GOA=OFF",
+ "-DENABLE_GOA=ON",
"-DENABLE_EXAMPLES=OFF",
"-DENABLE_INTROSPECTION=OFF",
"-DENABLE_VALA_BINDINGS=OFF",
"-DENABLE_INSTALLED_TESTS=OFF",
"-DENABLE_GTK_DOC=OFF",
+ "-DENABLE_DBUS_SESSION_TOOL=ON",
"-DWITH_PRIVATE_DOCS=OFF",
"-DWITH_PHONENUMBER=OFF",
"-DWITH_SYSTEMDUSERUNITDIR=OFF"
@@ -303,9 +320,11 @@
{
"type": "script",
"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 &",
"sleep 1",
"/app/libexec/evolution-addressbook-factory -r &",
@@ -319,7 +338,14 @@
{
"type": "script",
- "commands": [ "dbus-run-session /app/bin/evolution-wrapper" ],
+ "commands": [
+ "/app/libexec/evolution-data-server/evolution-dbus-session
\\",
+ " --exec /app/bin/evolution-wrapper \\",
+ " --service-dir /app/share/dbus-1/services/ \\",
+ " --iface
org.freedesktop.Notifications:/org/freedesktop/Notifications \\",
+ " --iface
org.freedesktop.portal.Desktop:/org/freedesktop/portal/desktop \\",
+ " --iface
org.gnome.OnlineAccounts:/org/gnome/OnlineAccounts"
+ ],
"dest-filename": "flatpak-evolution-run.sh"
}
],
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index c322ff2306..2190da43b8 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -25,7 +25,10 @@
"--share=network",
"--socket=x11",
"--socket=wayland",
- "--socket=pulseaudio"
+ "--socket=pulseaudio",
+ "--talk-name=org.gnome.OnlineAccounts",
+ "--talk-name=org.freedesktop.Notifications",
+ "--talk-name=org.freedesktop.portal.Desktop"
],
"modules": [
{
@@ -59,6 +62,19 @@
]
},
+ {
+ "name": "gnome-online-accounts",
+ "config-opts": [ "--disable-Werror", "--disable-telepathy",
"--disable-documentation", "--disable-backend" ],
+ "cleanup": [ "/bin", "/share/GConf" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://download.gnome.org/sources/gnome-online-accounts/3.28/gnome-online-accounts-3.28.0.tar.xz",
+ "sha256":
"87bc4ef307604f1ce4f09f6e5c9996ef8d37ca5e0a3bf76f6b27d71844adb40c"
+ }
+ ]
+ },
+
{
"name": "libgdata",
"config-opts": [
@@ -226,15 +242,16 @@
"config-opts": [
"-DENABLE_FILE_LOCKING=fcntl",
"-DENABLE_DOT_LOCKING=OFF",
- "-DENABLE_GOOGLE_AUTH=ON",
+ "-DENABLE_OAUTH2=ON",
"-DENABLE_GTK=ON",
"-DENABLE_UOA=OFF",
- "-DENABLE_GOA=OFF",
+ "-DENABLE_GOA=ON",
"-DENABLE_EXAMPLES=OFF",
"-DENABLE_INTROSPECTION=OFF",
"-DENABLE_VALA_BINDINGS=OFF",
"-DENABLE_INSTALLED_TESTS=OFF",
"-DENABLE_GTK_DOC=OFF",
+ "-DENABLE_DBUS_SESSION_TOOL=ON",
"-DWITH_PRIVATE_DOCS=OFF",
"-DWITH_PHONENUMBER=OFF",
"-DWITH_SYSTEMDUSERUNITDIR=OFF"
@@ -302,9 +319,11 @@
{
"type": "script",
"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 &",
"sleep 1",
"/app/libexec/evolution-addressbook-factory -r &",
@@ -318,7 +337,14 @@
{
"type": "script",
- "commands": [ "dbus-run-session /app/bin/evolution-wrapper" ],
+ "commands": [
+ "/app/libexec/evolution-data-server/evolution-dbus-session
\\",
+ " --exec /app/bin/evolution-wrapper \\",
+ " --service-dir /app/share/dbus-1/services/ \\",
+ " --iface
org.freedesktop.Notifications:/org/freedesktop/Notifications \\",
+ " --iface
org.freedesktop.portal.Desktop:/org/freedesktop/portal/desktop \\",
+ " --iface
org.gnome.OnlineAccounts:/org/gnome/OnlineAccounts"
+ ],
"dest-filename": "flatpak-evolution-run.sh"
}
],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]