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

[Libreoffice Gerrit user]

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

New commits:
commit 76dbcbf621af4e684ff0d9a36f1f5a0e3cc219b1
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 3 10:50:36 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 3 21:59:59 2018 +0200

    Adapt solenv/flatpak-manifest.in to recent changes
    
    Change-Id: Ibbc167ca736012e7585694885370c1505ad48499
    Reviewed-on: https://gerrit.libreoffice.org/59939
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index 10c767b52919..016c9b065431 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -45,6 +45,7 @@
 --without-system-libwps
 --without-system-libzmf
 --without-system-lpsolve
+--without-system-mariadb
 --without-system-mdds
 --without-system-mythes
 --without-system-neon
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 8964111edf8d..d9c397de4318 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -360,10 +360,16 @@
                     "dest-filename": "external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2",
-                    "sha256": "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1",
+                    "url": "https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz",
+                    "sha256": "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60",
                     "type": "file",
-                    "dest-filename": "external/tarballs/mdds-1.3.1.tar.bz2"
+                    "dest-filename": "external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+                },
+                {
+                    "url": "https://dev-www.libreoffice.org/src/mdds-1.4.1.tar.bz2",
+                    "sha256": "9ac690c37f5f06dc88551405d5daf9d9ad25edf65aae6325b59e905c2ba444c3",
+                    "type": "file",
+                    "dest-filename": "external/tarballs/mdds-1.4.1.tar.bz2"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz",
@@ -390,10 +396,10 @@
                     "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz",
-                    "sha256": "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b",
+                    "url": "https://dev-www.libreoffice.org/src/liborcus-0.14.0.tar.gz",
+                    "sha256": "7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef",
                     "type": "file",
-                    "dest-filename": "external/tarballs/liborcus-0.13.4.tar.gz"
+                    "dest-filename": "external/tarballs/liborcus-0.14.0.tar.gz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz",