summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <stephan.bergmann@allotropia.de>2023-11-24 13:18:27 +0100
committerStephan Bergmann <stephan.bergmann@allotropia.de>2023-11-25 19:31:25 +0100
commit4333186f8ccfb7309e1212a2c46624b4d56cf0f9 (patch)
tree1e19c68942a8637f3ff55e4b5fbe85beae568e22
parent77a47ead5d126cca8d5529a92ce20c40f0f6ca06 (diff)
Update solenv/flatpak-manifest.in
* Incorporate <https://github.com/flathub/org.libreoffice.LibreOffice/commit/e8d48d8a15c9069dd420eac9f651f81fb377567b> "Update runtime to 23.08" * Adapt to recent FONT_NOTO_* change * Adapt to 3d5cafbe1727a95a54eb4a65d98d6d79ec46f0c8 "tdf#157518: external: bundle zxcvbn-c" Change-Id: Ia956a35c99f487b56a0f58bb591bea366faddbce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159926 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
-rw-r--r--distro-configs/LibreOfficeFlatpak.conf1
-rw-r--r--solenv/flatpak-manifest.in106
2 files changed, 103 insertions, 4 deletions
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index dae435621e89..b8375380ce02 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -60,4 +60,5 @@
--without-system-redland
--without-system-sane
--without-system-xmlsec
+--without-system-zxcvbn
--without-system-zxing
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6e174109c78a..58e2ce8f46f2 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,7 +1,7 @@
{
"id": "org.libreoffice.LibreOffice",
"runtime": "org.freedesktop.Platform",
- "runtime-version": "22.08",
+ "runtime-version": "23.08",
"sdk": "org.freedesktop.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.openjdk17"
@@ -402,11 +402,102 @@
"dest-filename": "@MDDS_TARBALL@"
},
{
- "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_TARBALL@",
- "sha256": "@FONT_NOTO_SHA256SUM@",
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_KUFI_ARABIC_TARBALL@",
+ "sha256": "@FONT_NOTO_KUFI_ARABIC_SHA256SUM@",
"type": "file",
"dest": "external/tarballs",
- "dest-filename": "@FONT_NOTO_TARBALL@"
+ "dest-filename": "@FONT_NOTO_KUFI_ARABIC_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_TARBALL@",
+ "sha256": "@FONT_NOTO_SANS_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SANS_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_TARBALL@",
+ "sha256": "@FONT_NOTO_SERIF_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SERIF_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_ARABIC_TARBALL@",
+ "sha256": "@FONT_NOTO_SANS_ARABIC_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SANS_ARABIC_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_NASKH_ARABIC_TARBALL@",
+ "sha256": "@FONT_NOTO_NASKH_ARABIC_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_NASKH_ARABIC_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_HEBREW_TARBALL@",
+ "sha256": "@FONT_NOTO_SANS_HEBREW_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SANS_HEBREW_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_HEBREW_TARBALL@",
+ "sha256": "@FONT_NOTO_SERIF_HEBREW_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SERIF_HEBREW_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_ARMENIAN_TARBALL@",
+ "sha256": "@FONT_NOTO_SANS_ARMENIAN_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SANS_ARMENIAN_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_ARMENIAN_TARBALL@",
+ "sha256": "@FONT_NOTO_SERIF_ARMENIAN_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SERIF_ARMENIAN_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_GEORGIAN_TARBALL@",
+ "sha256": "@FONT_NOTO_SANS_GEORGIAN_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SANS_GEORGIAN_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_GEORGIAN_TARBALL@",
+ "sha256": "@FONT_NOTO_SERIF_GEORGIAN_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SERIF_GEORGIAN_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_LAO_TARBALL@",
+ "sha256": "@FONT_NOTO_SANS_LAO_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SANS_LAO_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_LAO_TARBALL@",
+ "sha256": "@FONT_NOTO_SERIF_LAO_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SERIF_LAO_TARBALL@"
+ },
+ {
+ "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_LISU_TARBALL@",
+ "sha256": "@FONT_NOTO_SANS_LISU_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_NOTO_SANS_LISU_TARBALL@"
},
{
"url": "https://dev-www.libreoffice.org/src/@OPENLDAP_TARBALL@",
@@ -689,6 +780,13 @@
"dest-filename": "@JAVA_WEBSOCKET_TARBALL@"
},
{
+ "url": "https://dev-www.libreoffice.org/src/@ZXCVBN_C_TARBALL@",
+ "sha256": "@ZXCVBN_C_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@ZXCVBN_C_TARBALL@"
+ },
+ {
"url": "https://dev-www.libreoffice.org/extern/@OPENSYMBOL_TTF@",
"sha256": "@OPENSYMBOL_SHA256SUM@",
"type": "file",