diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-06-06 10:48:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-06-07 16:08:37 +0200 |
| commit | 930cb22f75c672c2fa3a4153094df4dd3a71cb7f (patch) | |
| tree | dc36e3f5faf78e3cdf6029bebcee48c725535b20 | |
| parent | Show the "status bar" property in the LO status indicator also in Writer (diff) | |
| download | core-930cb22f75c672c2fa3a4153094df4dd3a71cb7f.tar.gz core-930cb22f75c672c2fa3a4153094df4dd3a71cb7f.zip | |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 2 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 4 |
2 files changed, 3 insertions, 3 deletions
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" ] }, { |