[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Stephan Bergmann]

 distro-configs/LibreOfficeFlatpak.conf |    2 +-
 solenv/flatpak-manifest.in             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e0287fcde646c1f6377f3ae9babe7b5155780282
Author: Stephan Bergmann <sbergman at 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 <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 930cb22f75c672c2fa3a4153094df4dd3a71cb7f)
    Reviewed-on: https://gerrit.libreoffice.org/55429
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index 7fc1fbca36ea..2e4553e0a022 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -3,7 +3,7 @@
 --enable-release-build
 --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 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"
             ]
         },
         {