[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 4332375acee8b8ce618c1833a0c11ab13aea21fd
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 1 10:53:26 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 1 17:41:25 2020 +0200

    Adapt Flatpak build to new Box2D external requirement
    
    ...introduced with a7f2239e649ea1b9ef611d758841584ab51abed0 "external: bundle
    box2d"
    
    Change-Id: Ia1a46dc517073d3cf7f221d3f7275741e94995a1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97629
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index 0d0f9ce5c881..81604de9f1f7 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -14,6 +14,7 @@
 --without-system-beanshell
 --without-system-bluez
 --without-system-boost
+--without-system-box2d
 --without-system-clucene
 --without-system-coinmp
 --without-system-cppunit
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index aec05edaa8bc..073a559d57e6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -584,6 +584,12 @@
                     "type": "file",
                     "dest-filename": "external/tarballs/dtoa-20180411.tgz"
                 },
+                {
+                    "url": "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz",
+                    "sha256": "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c",
+                    "type": "file",
+                    "dest-filename": "external/tarballs/box2d-2.3.1.tar.gz"
+                },
                 {
                     "url": "https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf",
                     "sha256": "884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc",