[evolution] Flatpak: Update Flatpak manifests
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Flatpak: Update Flatpak manifests
- Date: Thu, 26 Nov 2020 11:30:19 +0000 (UTC)
commit cbdeee2acb753e3a54a7b4896a2ed4d259201191
Author: Milan Crha <mcrha redhat com>
Date: Thu Nov 26 12:26:17 2020 +0100
Flatpak: Update Flatpak manifests
* store user settings in the sandbox
* make it possible to override gnupg home directory
* update some dependencies
* use libical's 3.0 git branch instead of the tarball release (to
receive latest fixes in the stable branch)
flatpak/org.gnome.Evolution-master.json | 33 ++++++++++++++++-----------------
flatpak/org.gnome.Evolution-stable.json | 33 ++++++++++++++++-----------------
2 files changed, 32 insertions(+), 34 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index a59c8f2ecc..d3aea4fff9 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -29,11 +29,9 @@
"--socket=pulseaudio",
"--device=dri",
"--filesystem=~/.gnupg:rw",
- "--filesystem=xdg-run/dconf",
- "--filesystem=~/.config/dconf:ro",
+ "--filesystem=xdg-config/gnupg:rw",
"--filesystem=/run/.heim_org.h5l.kcm-socket",
- "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
- "--talk-name=ca.desrt.dconf",
+ "--metadata=X-DConf=migrate-path=/org/gnome/evolution/",
"--talk-name=org.freedesktop.Notifications",
"--talk-name=org.freedesktop.secrets",
"--talk-name=org.gnome.keyring.SystemPrompter",
@@ -89,9 +87,9 @@
],
"sources": [
{
- "type": "archive",
- "url":
"https://github.com/libical/libical/releases/download/v3.0.8/libical-3.0.8.tar.gz";,
- "sha256":
"09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f"
+ "type": "git",
+ "url": "https://github.com/libical/libical.git";,
+ "branch": "3.0"
}
]
},
@@ -121,8 +119,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/gnome-online-accounts/3.28/gnome-online-accounts-3.28.0.tar.xz";,
- "sha256":
"87bc4ef307604f1ce4f09f6e5c9996ef8d37ca5e0a3bf76f6b27d71844adb40c"
+ "url":
"https://download.gnome.org/sources/gnome-online-accounts/3.38/gnome-online-accounts-3.38.0.tar.xz";,
+ "sha256":
"3760ea78729b3038dda0c416b57bc2cbaafcc619eec6c5109654d747fad2418c"
}
]
},
@@ -144,8 +142,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.12.tar.xz";,
- "sha256":
"a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318"
+ "url":
"https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.13.tar.xz";,
+ "sha256":
"eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e"
}
]
},
@@ -178,8 +176,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/libgweather/3.34/libgweather-3.34.0.tar.xz";,
- "sha256":
"02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9"
+ "url":
"https://download.gnome.org/sources/libgweather/3.36/libgweather-3.36.1.tar.xz";,
+ "sha256":
"de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450"
}
]
},
@@ -203,8 +201,8 @@
"sources": [
{
"type": "archive",
- "url":
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.tgz";,
- "sha256":
"9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
+ "url":
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.56.tgz";,
+ "sha256":
"25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
},
{
@@ -228,8 +226,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/gspell/1.8/gspell-1.8.3.tar.xz";,
- "sha256":
"5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8"
+ "url":
"https://download.gnome.org/sources/gspell/1.9/gspell-1.9.1.tar.xz";,
+ "sha256":
"dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd"
}
]
},
@@ -361,6 +359,7 @@
"else",
" export BOGOFILTER_DIR=\"${XDG_DATA_HOME}/bogofilter/\"",
" export GIO_USE_NETWORK_MONITOR=base",
+ " export WEBKIT_FORCE_SANDBOX=0",
" gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
"",
" gpg-agent --homedir ~/.gnupg --daemon
--pinentry-program=/app/bin/pinentry",
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 017a6a8534..b3df651a23 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -28,11 +28,9 @@
"--socket=pulseaudio",
"--device=dri",
"--filesystem=~/.gnupg:rw",
- "--filesystem=xdg-run/dconf",
- "--filesystem=~/.config/dconf:ro",
+ "--filesystem=xdg-config/gnupg:rw",
"--filesystem=/run/.heim_org.h5l.kcm-socket",
- "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
- "--talk-name=ca.desrt.dconf",
+ "--metadata=X-DConf=migrate-path=/org/gnome/evolution/",
"--talk-name=org.freedesktop.Notifications",
"--talk-name=org.freedesktop.secrets",
"--talk-name=org.gnome.keyring.SystemPrompter",
@@ -88,9 +86,9 @@
],
"sources": [
{
- "type": "archive",
- "url":
"https://github.com/libical/libical/releases/download/v3.0.8/libical-3.0.8.tar.gz";,
- "sha256":
"09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f"
+ "type": "git",
+ "url": "https://github.com/libical/libical.git";,
+ "branch": "3.0"
}
]
},
@@ -120,8 +118,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/gnome-online-accounts/3.28/gnome-online-accounts-3.28.0.tar.xz";,
- "sha256":
"87bc4ef307604f1ce4f09f6e5c9996ef8d37ca5e0a3bf76f6b27d71844adb40c"
+ "url":
"https://download.gnome.org/sources/gnome-online-accounts/3.38/gnome-online-accounts-3.38.0.tar.xz";,
+ "sha256":
"3760ea78729b3038dda0c416b57bc2cbaafcc619eec6c5109654d747fad2418c"
}
]
},
@@ -143,8 +141,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.12.tar.xz";,
- "sha256":
"a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318"
+ "url":
"https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.13.tar.xz";,
+ "sha256":
"eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e"
}
]
},
@@ -177,8 +175,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/libgweather/3.34/libgweather-3.34.0.tar.xz";,
- "sha256":
"02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9"
+ "url":
"https://download.gnome.org/sources/libgweather/3.36/libgweather-3.36.1.tar.xz";,
+ "sha256":
"de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450"
}
]
},
@@ -202,8 +200,8 @@
"sources": [
{
"type": "archive",
- "url":
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.tgz";,
- "sha256":
"9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
+ "url":
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.56.tgz";,
+ "sha256":
"25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
},
{
@@ -227,8 +225,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/gspell/1.8/gspell-1.8.3.tar.xz";,
- "sha256":
"5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8"
+ "url":
"https://download.gnome.org/sources/gspell/1.9/gspell-1.9.1.tar.xz";,
+ "sha256":
"dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd"
}
]
},
@@ -360,6 +358,7 @@
"else",
" export BOGOFILTER_DIR=\"${XDG_DATA_HOME}/bogofilter/\"",
" export GIO_USE_NETWORK_MONITOR=base",
+ " export WEBKIT_FORCE_SANDBOX=0",
" gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
"",
" gpg-agent --homedir ~/.gnupg --daemon
--pinentry-program=/app/bin/pinentry",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
