distro-configs/LibreOfficeFlatpak.conf | 2 +-
solenv/flatpak-manifest.in | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 930cb22f75c672c2fa3a4153094df4dd3a71cb7f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jun 6 10:48:27 2018 +0200
Update Flatpak to OpenJDK10
see <https://github.com/flathub/org.libreoffice.LibreOffice/issues/42>
"OpenJDK 10 is now available".
Change-Id: Iaae9d22d91d984a5c11eee26bd05ab7d328d7a5b
Reviewed-on: https://gerrit.libreoffice.org/55422
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/distro-configs/LibreOfficeFlatpak.conf
b/distro-configs/LibreOfficeFlatpak.conf
index a3bec727d4ce..23b3780c934e 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -4,7 +4,7 @@
--enable-symbols
--with-ant-home=/run/build/libreoffice/ant
--with-extra-buildid=Flatpak version
---with-jdk-home=/usr/lib/sdk/openjdk9/jvm/openjdk-9
+--with-jdk-home=/usr/lib/sdk/openjdk10/jvm/openjdk-10
--with-lang=ALL
--with-system-libs
--with-vendor=The Document Foundation
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a01b45dd76b3..e49ee535b980 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -5,7 +5,7 @@
"sdk": "org.freedesktop.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.gcc7",
- "org.freedesktop.Sdk.Extension.openjdk9"
+ "org.freedesktop.Sdk.Extension.openjdk10"
],
"build-options": {
"append-ld-library-path": "/usr/lib/sdk/gcc7/lib",
@@ -28,7 +28,7 @@
"name": "openjdk",
"buildsystem": "simple",
"build-commands": [
- "/usr/lib/sdk/openjdk9/install.sh"
+ "/usr/lib/sdk/openjdk10/install.sh"
]
},
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
