commit c074abd484f7666c954942b750b8e1c445013636
author Stephan Bergmann <sbergman@redhat.com> Mon May 14 16:58:14 2018 +0200
committer Stephan Bergmann <sbergman@redhat.com> Tue May 15 08:39:05 2018 +0200
tree 15cf401f6f0bd65c881ff10c1259caa7caf0cefb
parent d2c85c671deb8bb27c4a421f99d238b7a89b0ece

Merge in Flatpak improvements

...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:

Author: Stephan Bergmann <sbergman@redhat.com>
Date:   Mon May 14 16:51:37 2018 +0200

    Find flatpak'ed Java installation via JAVA_HOME

    ...instead of via PATH, so that a JAVA_HOME inherited from the environment
    doesn't accidentally select a different Java installation.  Fixes
    <https://github.com/flathub/org.libreoffice.LibreOffice/issues/37> "undefined
    symbol: FT_Done_MM_Var".

Change-Id: I2b4c3a55c92f0ef5c5925f0a9909b7b061eedeeb
Reviewed-on: https://gerrit.libreoffice.org/54330
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

solenv/flatpak-manifest.in

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6222a34..43187d1 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -592,8 +592,8 @@
        "--device=dri",
        "--filesystem=host",
        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
        "--env=JAVA_HOME=/app/jre",
        "--env=LIBO_FLATPAK=1",
        "--env=PATH=/usr/bin:/app/jre/bin",
        "--own-name=org.libreoffice.LibreOfficeIpc0",
        "--talk-name=ca.desrt.dconf",
        "--talk-name=org.gtk.vfs.*"