distro-configs/LibreOfficeFlatpak.conf | 2 +-
solenv/flatpak-manifest.in | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 50b9dcff911e735215a2ad083ecebff5f93cbed6
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 18 11:38:59 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 19 08:44:50 2021 +0200
Adapt Flatpak build to switch from qrcodegen to zxing
Change-Id: Ifcaa703d18a5bae03d389ca2fd69924c4c6ec0e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115773
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/distro-configs/LibreOfficeFlatpak.conf
b/distro-configs/LibreOfficeFlatpak.conf
index 97bfaba200fc..bef37df46c1b 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -54,7 +54,7 @@
--without-system-orcus
--without-system-poppler
--without-system-postgresql
---without-system-qrcodegen
--without-system-redland
--without-system-sane
--without-system-xmlsec
+--without-system-zxing
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 0592ab2503f3..3aa0e400cfd5 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -392,12 +392,6 @@
"type": "file",
"dest-filename":
"external/tarballs/postgresql-13.1.tar.bz2"
},
- {
- "url":
"https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";,
- "sha256":
"fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a",
- "type": "file",
- "dest-filename":
"external/tarballs/QR-Code-generator-1.4.0.tar.gz"
- },
{
"url":
"https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";,
"sha256":
"ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed",
@@ -590,6 +584,12 @@
"type": "file",
"dest-filename": "external/tarballs/box2d-2.3.1.tar.gz"
},
+ {
+ "url":
"https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz";,
+ "sha256":
"e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86",
+ "type": "file",
+ "dest-filename": "external/tarballs/zxing-cpp-1.1.1.tar.gz"
+ },
{
"url":
"https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf";,
"sha256":
"f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140",
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
