diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-12 09:41:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-12 16:29:20 +0100 |
| commit | 6ed4050f16265bfb02090592c6e88813796ac68d (patch) | |
| tree | 9a28d1e722e8ae5b54305a6139adfe159733fb67 | |
| parent | 6ae9d6ea0497b5935678c826940b14893a6531d0 (diff) | |
Adapt Flatpak build to new external/argon2co-24.04-branch-point
Change-Id: I584956151b036e1ba781439205a76f579f32c064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161955
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
(cherry picked from commit 2b1a4f6309437128077c33e27262c052a408b9ba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161990
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 1 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index b8375380ce02..3850269ace0f 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -11,6 +11,7 @@ --without-junit --without-lxml --without-system-abseil +--without-system-argon2 --without-system-beanshell --without-system-bluez --without-system-boost diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index e9fa79e8f55f..a8d8b88394a8 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -787,6 +787,13 @@ "dest-filename": "@ZXCVBN_C_TARBALL@" }, { + "url": "https://dev-www.libreoffice.org/src/@ARGON2_TARBALL@", + "sha256": "@ARGON2_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@ARGON2_TARBALL@" + }, + { "url": "https://dev-www.libreoffice.org/extern/@OPENSYMBOL_TTF@", "sha256": "@OPENSYMBOL_SHA256SUM@", "type": "file", |