summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-07-01 10:53:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-07-01 17:41:25 +0200
commit4332375acee8b8ce618c1833a0c11ab13aea21fd (patch)
tree211111902a17034b67aa96af81bd3073f40027a5
parent2cc95ef7f001d284ce70563ade4acc28f0a28caa (diff)
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@redhat.com>
-rw-r--r--distro-configs/LibreOfficeFlatpak.conf1
-rw-r--r--solenv/flatpak-manifest.in6
2 files changed, 7 insertions, 0 deletions
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
@@ -585,6 +585,12 @@
"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",
"type": "file",