[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef389eb874e29dba91be55acdbe238396687ec54
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 14 16:58:14 2018 +0200

    Merge in Flatpak improvements
    
    ...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
    
    Author: Stephan Bergmann <sbergman at 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/54331
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 2134b139c7d6..c22d921f91dc 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.*"