distro-configs/LibreOfficeFlatpak.conf | 1 +
solenv/flatpak-manifest.in | 7 +++++++
2 files changed, 8 insertions(+)
New commits:
commit eb482b5a819658240113d32ec0b9dac2f2f5f0dd
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Jan 12 09:41:28 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jan 23 16:35:41 2024 +0100
Adapt Flatpak build to new external/argon2
Change-Id: I584956151b036e1ba781439205a76f579f32c064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161955
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
(cherry picked from commit 2b1a4f6309437128077c33e27262c052a408b9ba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161990
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 6ed4050f16265bfb02090592c6e88813796ac68d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162101
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Tested-by: Michael Weghorn <m.wegh...@posteo.de>
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
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 58e2ce8f46f2..a0e2f5b4642b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -786,6 +786,13 @@
"dest": "external/tarballs",
"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@",
