distro-configs/LibreOfficeFlatpak.conf | 2 +-
solenv/flatpak-manifest.in | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5a2f1545134ec25d9bcb5f0d64bc7db8dc5aeb37
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 2 16:34:51 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 3 09:25:06 2019 +0100
Update Flatpak to OpenJDK11
see <https://github.com/flathub/org.libreoffice.LibreOffice/issues/57>
"OpenJDK 11 is available".
Change-Id: Ie24ed7349ca9a4a57c1a8d18d10b29c4a37e259c
Reviewed-on: https://gerrit.libreoffice.org/65830
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/distro-configs/LibreOfficeFlatpak.conf
b/distro-configs/LibreOfficeFlatpak.conf
index c0c79b7ce959..65f473c48b51 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -4,7 +4,7 @@
--with-ant-home=/run/build/libreoffice/ant
--with-extra-buildid=Flatpak
--with-help=html
---with-jdk-home=/usr/lib/sdk/openjdk10/jvm/openjdk-10
+--with-jdk-home=/usr/lib/sdk/openjdk11/jvm/openjdk-11
--with-lang=ALL
--with-system-libs
--with-vendor=The Document Foundation
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index cbe530a82fd4..8106f7d30048 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -4,7 +4,7 @@
"runtime-version": "18.08",
"sdk": "org.freedesktop.Sdk",
"sdk-extensions": [
- "org.freedesktop.Sdk.Extension.openjdk10"
+ "org.freedesktop.Sdk.Extension.openjdk11"
],
"command": "/app/libreoffice/program/soffice",
"modules": [
@@ -12,7 +12,7 @@
"name": "openjdk",
"buildsystem": "simple",
"build-commands": [
- "/usr/lib/sdk/openjdk10/install.sh"
+ "/usr/lib/sdk/openjdk11/install.sh"
]
},
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
