diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-06-06 10:48:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-27 06:42:42 +0200 |
| commit | a0e375b8c3e0b765d082efe8af23c6b231c6f3d6 (patch) | |
| tree | 71ddca46508e7a1d9a03984247bf766bb37816b5 /solenv | |
| parent | eacb8b0bf4fd82b3cc1f392ae91dbe5dbe2b89b0 (diff) | |
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>
(cherry picked from commit 930cb22f75c672c2fa3a4153094df4dd3a71cb7f)
Reviewed-on: https://gerrit.libreoffice.org/55429
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit e0287fcde646c1f6377f3ae9babe7b5155780282)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/flatpak-manifest.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index a8ed8895462c..7adaa1bbd83a 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" ] }, { |