diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-09 14:41:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-09 21:25:34 +0200 |
| commit | 727bfa2c87db170483c1e4ae895174295b070c77 (patch) | |
| tree | 4d8fb9f94fd586b18cfd4efa1ce6cfeef84720c6 /distro-configs | |
| parent | 0b0bc5eb77ac735573482dddd6814c9763f8c6e1 (diff) | |
Merge in Flatpak improvements
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
commit 7a2393f5fcab8c6938180c4718f2c61acd495528
Author: Robert McQueen <rob@endlessm.com>
Date: Tue Apr 3 10:41:22 2018 +0100
port to freedesktop.org 1.6 runtime
Gtk+3/GIO/etc dependencies used by LO in "GNOME" mode are actually
included in the freedesktop.org runtime. Try to build against fd.o
by downgrading gst-libav (fd.o has gst 1.10 rather than gnome's 1.12),
bundling dbus-glib and disable Gtk+ 2.
commit 42650da01f270e86bfb40035a9194b23ccf24c4c
Author: Robert McQueen <rob@endlessm.com>
Date: Tue Apr 3 11:23:27 2018 +0100
fix up LD_LIBRARY_PATH with gcc7
Append to library path rather than resetting it (causes build failures
due to overriding /app/lib).
commit 3e4c655294c8124cb54e1c651ec4dc1230b8151e
Author: Robert McQueen <rob@endlessm.com>
Date: Tue Apr 3 11:25:02 2018 +0100
fixup solenv/bin/assemble_flatpak.sh
Use mkdir -p to be robust to other modules (ie dbus-glib) creating
some of the paths before we do.
commit d1d449ffa837b1de876f524494dbce09ec92ce73
Author: Robert McQueen <rob@endlessm.com>
Date: Wed Apr 4 15:50:49 2018 +0100
split resource/registry data into Locales extension
Move the language-specific data into the /app/share/runtime path which
flatpak-builder splits into the Locale extension if we re-enable
separate-locales. We symlink the original locations back to these paths, which
means we have dangling symlinks depending on which Locale sutpaths are
installed.
Include Stephan Bergmann's patch from https://gerrit.libreoffice.org/#/c/52381/
to make the configmgr robust to such dangling links.
commit ad6674f166c68fb79e19d80950a104a0a33f81dc
Author: Robert McQueen <rob@endlessm.com>
Date: Wed Apr 4 16:05:28 2018 +0100
make locale split glob more specific
This loop will fail if the share/registry/res folder gains any .xcd
files which are not named fcfg_langpack_* or registry_* so just to
be safe, only glob these files.
Change-Id: Icd41d7077b9f308dbb196927715b210328709662
Reviewed-on: https://gerrit.libreoffice.org/52642
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index 68b0089cbe27..897b7cc30ff7 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -1,3 +1,4 @@ +--disable-gtk --disable-odk --enable-release-build --enable-symbols |