Kaydet (Commit) 0625358f authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Caolán McNamara

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/55431Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 67aaa986)
Reviewed-on: https://gerrit.libreoffice.org/55439Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 3a250571
...@@ -58,6 +58,19 @@ ...@@ -58,6 +58,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", "name": "libreoffice",
"sources": [ "sources": [
...@@ -591,7 +604,9 @@ ...@@ -591,7 +604,9 @@
"--socket=pulseaudio", "--socket=pulseaudio",
"--device=dri", "--device=dri",
"--filesystem=host", "--filesystem=host",
"--filesystem=xdg-run/dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
"--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
"--env=JAVA_HOME=/app/jre", "--env=JAVA_HOME=/app/jre",
"--env=LIBO_FLATPAK=1", "--env=LIBO_FLATPAK=1",
"--own-name=org.libreoffice.LibreOfficeIpc0", "--own-name=org.libreoffice.LibreOfficeIpc0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment