diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-06-07 17:36:37 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-27 06:40:24 +0200 |
| commit | ae415df13304a479f2d801ab931b09058ba15737 (patch) | |
| tree | 8b08f34dbf139e65df188d17d3ce30d488054ddb /solenv | |
| parent | a4440b04d68c75cc9152b43d6e65eed4b3d7d160 (diff) | |
Merge in Flatpak improvements
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
commit 0242fa00493c0521d75c60cc4987fb8c7f3abeb1
Author: Robert McQueen <rob@endlessm.com>
Date: Tue May 15 11:08:30 2018 +0100
add missing share of dconf runtime dir
This breaks dconf change notifications, including the GSettings used for Gtk+
themes. Could also cause other weird settings problems.
https://github.com/flathub/org.libreoffice.LibreOffice/issues/31
commit 800d0d553fec6bd093f813cb4aa2f10dcbe10aee
Author: Stephan Bergmann <sbergman@redhat.com>
Date: Thu May 31 18:02:13 2018 +0200
Re-enable GIO support
...that was inadvertently lost when switching from the GNOME to the
freedesktop.org runtime. For one, LO configure's --disable-gtk erroneously
implied --disable-gio, even under --enable-gtk3. For another, gvfs is missing
from the freedesktop.org runtime; the recipe is copied from
<https://gitlab.gnome.org/GNOME/gnome-sdk-images/blob/gnome-3-28/
org.gnome.Sdk.json.in#L536>.
This hopefully fixes
<https://github.com/flathub/org.libreoffice.LibreOffice/issues/41> "Again unable
to open files on network shares".
Change-Id: Ib0a3680dc4eb2595eb2d8b0bb30c54082651686c
Reviewed-on: https://gerrit.libreoffice.org/55431
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 67aaa98600269e6b8fa631146c3649a261369471)
Reviewed-on: https://gerrit.libreoffice.org/55439
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 0625358f79cbbc15f4374aec207f516a004c4207)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/flatpak-manifest.in | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index c22d921f91dc..ebeda89a78cc 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -59,6 +59,19 @@ ] }, { + "name": "gvfs", + "cleanup": [ "/libexec/*", "/share/dbus-1/services/*", "/share/gvfs/mounts" ], + "config-opts": [ "--disable-hal", "--disable-gdu", "--disable-gcr", "--disable-obexftp", + "--disable-avahi", "--disable-documentation", "--disable-admin" ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/gvfs/1.36/gvfs-1.36.1.tar.xz", + "sha256": "3840dff386c2c8a445337bea4ade0eb71339efaff8602767659fa2896792f026" + } + ] + }, + { "name": "libreoffice", "sources": [ { @@ -591,7 +604,9 @@ "--socket=pulseaudio", "--device=dri", "--filesystem=host", + "--filesystem=xdg-run/dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf", + "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules", "--env=JAVA_HOME=/app/jre", "--env=LIBO_FLATPAK=1", "--own-name=org.libreoffice.LibreOfficeIpc0", |