solenv/flatpak-manifest.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit c074abd484f7666c954942b750b8e1c445013636 Author: Stephan Bergmann <sberg...@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 <sberg...@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 <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 6222a34e3074..43187d11c65a 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.*" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits