[Libreoffice-commits] core.git: 2 commits - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |   22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 7ea2311ab734d19b705cf98aa9506cbe122e74e4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 9 13:58:03 2018 +0100

    Adapt solenv/flatpak-manifest.in
    
    ...to e13acfcac9571da7efeec8fe5b27b11249d51c27 "Update liborcus to 0.13.2."
    
    Change-Id: I5e2b8d9ea4f91571fe884944a6c0a390d650993f

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 0ad8a349c441..a12d62985e84 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -360,10 +360,10 @@
                     "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz",
-                    "sha256": "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937",
+                    "url": "https://dev-www.libreoffice.org/src/liborcus-0.13.2.tar.gz",
+                    "sha256": "0f8e85dc163881c358bd175227a970e3c70443109e2bb0d8d422439c31641df2",
                     "type": "file",
-                    "dest-filename": "external/tarballs/liborcus-0.13.1.tar.gz"
+                    "dest-filename": "external/tarballs/liborcus-0.13.2.tar.gz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz",
commit f3062fd2e39819bcb1e8bbb76355cc50d7257652
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 9 12:01:53 2018 +0100

    solenv/flatpak-manifest.in: Merge in building with GCC 7
    
    This merges in
    
    * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/
    d1ca6fbdac7f0adcfd813ac5556d6ad979924232> "switch to gcc7",
    
    * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/
    687e79514c12bb8c6fd7dfd93f1e4fb84fc6af54> "Copy
    org.freedesktop.Sdk.Extension.gcc7 libs into app", and
    
    * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/
    41b361bf4973b0981f834fe58b3f808b0ca81634> "Use `cp -d` to preserve symlinks",
    
    which should allow to build on 32-bit arm once
    <https://github.com/flathub/org.freedesktop.Sdk.Extension.openjdk9/issues/4>
    "ARM version" is fixed.
    
    Those had been reverted again on flathub with <https://github.com/flathub/
    org.libreoffice.LibreOffice/commit/1168072d19f358ffacc783aa83773789c6eafb99>
    "Revert 'Gcc7' again, for now" because it had apeared back then that using GCC 7
    caused the build to fail on aarch64.  This has meanwhile been tracked down to
    be an issue with PDFium instead, see ffc134445ef7e935d18d816626f64e65b4cdbca6
    "--disable-pdfium for Linux aarch64 Flatpak build".
    
    Change-Id: I594d38ecfdf7dbd78b91af04b9f3f3e86987b8e5

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 0bbd0319d49d..0ad8a349c441 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -4,12 +4,28 @@
     "runtime-version": "3.24",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
+        "org.freedesktop.Sdk.Extension.gcc7",
         "org.freedesktop.Sdk.Extension.openjdk9"
     ],
+    "build-options": {
+        "env": {
+            "CC": "/usr/lib/sdk/gcc7/bin/gcc",
+            "CXX": "/usr/lib/sdk/gcc7/bin/g++",
+            "LD_LIBRARY_PATH": "/usr/lib/sdk/gcc7/lib"
+        }
+    },
     "command": "/app/libreoffice/program/soffice",
     "separate-locales": false,
     "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": [