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

[Libreoffice Gerrit user]

 download.lst               |    4 ++--
 solenv/flatpak-manifest.in |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6584a5d9d1bb3e9b00e529358c989e8485071e36
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jan 25 18:02:54 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jan 28 13:42:45 2019 +0100

    Upgrade libatomic_ops to latest libatomic_ops-7.6.8.tar.gz
    
    ...from <https://github.com/ivmai/libatomic_ops/wiki/Download>.  (The md5sum
    given there is 99128f05e3e3f4e0cd39aa23f23bbe0c.)
    
    The old version of external/libatomic_ops failed to build at least when building
    a Flatpak for aarch64, see
    <https://flathub.org/builds/#/builders/39/builds/702/steps/5/logs/stdio>:
    
    [...]
    > Making all in src
    > Making all in atomic_ops
    > Making all in sysdeps
    > In file included from atomic_ops_stack.h:32,
    >                  from atomic_ops_malloc.c:20:
    > atomic_ops.h:343:4: error: #error Cannot implement AO_compare_and_swap_full on this architecture.
    >  #  error Cannot implement AO_compare_and_swap_full on this architecture.
    >     ^~~~~
    > atomic_ops.c:97:1: error: unknown type name ‘AO_TS_t’; did you mean ‘AO_TS_T’?
    >  AO_TS_t AO_locks[AO_HASH_SIZE] = {
    >  ^~~~~~~
    >  AO_TS_T
    [...]
    
    (cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/
    48b22dbabc06f1822df74f755096cf0ea5ba2499> "Upgrade libatomic_ops to latest
    libatomic_ops-7.6.8.tar.gz")
    
    Change-Id: Icc040cc47f45f71577995a2ff9c63df97150bdea
    Reviewed-on: https://gerrit.libreoffice.org/66983
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/download.lst b/download.lst
index 5d4b8f06c4f3..009baa8ff72c 100644
--- a/download.lst
+++ b/download.lst
@@ -140,8 +140,8 @@ export LCMS2_SHA256SUM := 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f80
 export LCMS2_TARBALL := lcms2-2.9.tar.gz
 export LIBASSUAN_SHA256SUM := 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
 export LIBASSUAN_TARBALL := libassuan-2.5.1.tar.bz2
-export LIBATOMIC_OPS_SHA256SUM := cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad
-export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
+export LIBATOMIC_OPS_SHA256SUM := 1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665
+export LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz
 export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_SHA256SUM := 13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bd534ad5999f..4582a79243fe 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -553,10 +553,10 @@
                     "dest-filename": "external/tarballs/libnumbertext-1.0.5.tar.xz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip",
-                    "sha256": "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad",
+                    "url": "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz",
+                    "sha256": "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665",
                     "type": "file",
-                    "dest-filename": "external/tarballs/libatomic_ops-7_2d.zip"
+                    "dest-filename": "libatomic_ops-7.6.8.tar.gz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf",