[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/flatpak-manifest.in |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

New commits:
commit ae9336474e3cddf8f00471367c06afd5e0e91561
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 7 12:14:26 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Dec 7 23:27:37 2018 +0100

    Upgrade flatpak to org.freedesktop.Sdk//18.08
    
    ...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/54>
    "Build against org.freedesktop.Platform 18.08"
    
    Change-Id: I70448277ce326075435932c75a837bd7be3d4508
    (cherry picked from commit 9d6799c116cab67c43893e81904386d90992211e)
    Reviewed-on: https://gerrit.libreoffice.org/64775
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index f7ff7785dd67..ee36da9c35ad 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,30 +1,14 @@
 {
     "id": "org.libreoffice.LibreOffice",
     "runtime": "org.freedesktop.Platform",
-    "runtime-version": "1.6",
+    "runtime-version": "18.08",
     "sdk": "org.freedesktop.Sdk",
     "sdk-extensions": [
-        "org.freedesktop.Sdk.Extension.gcc7",
         "org.freedesktop.Sdk.Extension.openjdk10"
     ],
-    "build-options": {
-        "append-ld-library-path": "/usr/lib/sdk/gcc7/lib",
-        "env": {
-            "CC": "/usr/lib/sdk/gcc7/bin/gcc",
-            "CXX": "/usr/lib/sdk/gcc7/bin/g++"
-        }
-    },
     "command": "/app/libreoffice/program/soffice",
     "modules": [
         {
-            "name": "gcc7",
-            "buildsystem": "simple",
-            "build-commands": [
-                "mkdir -p /app/lib",
-                "cp -d /usr/lib/sdk/gcc7/lib/lib{gcc_s.so.1,stdc++.so.6*} /app/lib"
-            ]
-        },
-        {
             "name": "openjdk",
             "buildsystem": "simple",
             "build-commands": [