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

[Libreoffice Gerrit user]

 distro-configs/LibreOfficeFlatpak.conf |    1 +
 solenv/flatpak-manifest.in             |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit 743f57b3f83e324cdbb2cf60433bbd8a12b3c3b8
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jan 28 09:13:33 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jan 28 22:13:06 2019 +0100

    aarch64 and arm need libatomic_ops
    
    (cf. LO's configure.ac, needed for external/firebird on non-x86[-64]), but
    org.freedesktop.Sdk//18.08 apparently doesn't provide it (while
    org.freedesktop.Sdk//1.6 apparently did)
    
    (cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/
    b2762523a4678bedd55c11db232868cbaf9c7bdd> "aarch64 and arm need libatomic_ops")
    
    Change-Id: I6eb060251ce85bfd399b72d9c90a93497a3a9029
    Reviewed-on: https://gerrit.libreoffice.org/66987
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 273e9694ee3920fed5cdf0da59d88f32a6294a2a)
    Reviewed-on: https://gerrit.libreoffice.org/67004
    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 65f473c48b51..9d638fa0a449 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -23,6 +23,7 @@
 --without-system-gpgmepp
 --without-system-jfreereport
 --without-system-libabw
+--without-system-libatomic_ops
 --without-system-libcdr
 --without-system-libcmis
 --without-system-libebook
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 36ec66991ebc..abb3f79b284b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -542,6 +542,12 @@
                     "dest-filename": "external/tarballs/libnumbertext-1.0.5.tar.xz"
                 },
                 {
+                    "url": "https://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip",
+                    "sha256": "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad",
+                    "type": "file",
+                    "dest-filename": "external/tarballs/libatomic_ops-7_2d.zip"
+                },
+                {
                     "url": "https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf",
                     "sha256": "49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63",
                     "type": "file",