[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 distro-configs/LibreOfficeFlatpak.conf |    1 +
 solenv/flatpak-manifest.in             |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit e046381467f7ad03a845156042dcedb75e56f0d3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 9 08:54:42 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 11 19:26:58 2019 +0200

    Adapt solenv/flatpak-manifest.in to "bundle external: qrcodegen"
    
    (b4141cade04dac0c9d47293313a4521282975f12)
    
    Change-Id: I3474bdf62d865974bf03682c3201d8dc42993c7a
    Reviewed-on: https://gerrit.libreoffice.org/78780
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index 9d638fa0a449..5bdba7501869 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -55,6 +55,7 @@
 --without-system-orcus
 --without-system-poppler
 --without-system-postgresql
+--without-system-qrcodegen
 --without-system-redland
 --without-system-sane
 --without-system-xmlsec
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 9ebddffefca1..ca233e6a8e88 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -383,6 +383,12 @@
                     "dest-filename": "external/tarballs/postgresql-9.2.24.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",
                     "type": "file",