[Libreoffice-commits] core.git: download.lst external/libvisio solenv/flatpak-manifest.in

[David Tardon (via logerrit)]

 download.lst                                   |    4 +-
 external/libvisio/0001-fix-debug-build.patch.1 |   40 -------------------------
 external/libvisio/UnpackedTarball_libvisio.mk  |    1 
 external/libvisio/ubsan.patch                  |    4 +-
 solenv/flatpak-manifest.in                     |    6 +--
 5 files changed, 7 insertions(+), 48 deletions(-)

New commits:
commit d83472ab6fde650772307f7f93a0a4b96e7ea6a8
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Sat Aug 17 17:06:07 2019 +0200
Commit:     David Tardon <dtardon at redhat.com>
CommitDate: Sat Aug 17 18:36:51 2019 +0200

    upload libvisio 0.1.7
    
    Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033
    Reviewed-on: https://gerrit.libreoffice.org/77640
    Tested-by: Jenkins
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index 2491472e574a..4539a35a9b3c 100644
--- a/download.lst
+++ b/download.lst
@@ -238,8 +238,8 @@ export TWAIN_DSM_SHA256SUM := 82c818be771f242388457aa8c807e4b52aa84dc22b21c6c561
 export TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
 export UCPP_SHA256SUM := 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-export VISIO_SHA256SUM := fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9
-export VISIO_TARBALL := libvisio-0.1.6.tar.xz
+export VISIO_SHA256SUM := 8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
+export VISIO_TARBALL := libvisio-0.1.7.tar.xz
 export WPD_SHA256SUM := 2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09
 export WPD_VERSION_MICRO := 3
 export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
diff --git a/external/libvisio/0001-fix-debug-build.patch.1 b/external/libvisio/0001-fix-debug-build.patch.1
deleted file mode 100644
index 4146e6e8bfe7..000000000000
--- a/external/libvisio/0001-fix-debug-build.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15f3774513d0181ad90da382297c175cc3424462 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Sun, 22 Oct 2017 21:24:43 +0200
-Subject: [PATCH] fix debug build
-
-Change-Id: I860b6034e5d833900652aec8c3647eeae185e538
----
- src/lib/VDXParser.cpp  | 2 +-
- src/lib/VSDXParser.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
-index f2f3154..0f07efd 100644
---- a/src/lib/VDXParser.cpp
-+++ b/src/lib/VDXParser.cpp
-@@ -916,7 +916,7 @@ xmlChar *libvisio::VDXParser::readStringData(xmlTextReaderPtr reader)
-     ret = xmlTextReaderRead(reader);
-     if (1 == ret && stringValue)
-     {
--      VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const char *)stringValue));
-+      VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const char *)stringValue.get()));
-       return stringValue.release();
-     }
-   }
-diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
-index 488be3a..efd46b9 100644
---- a/src/lib/VSDXParser.cpp
-+++ b/src/lib/VSDXParser.cpp
-@@ -555,7 +555,7 @@ xmlChar *libvisio::VSDXParser::readStringData(xmlTextReaderPtr reader)
-   std::unique_ptr<xmlChar, void (*)(void *)> stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("V")), xmlFree);
-   if (stringValue)
-   {
--    VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char *)stringValue));
-+    VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char *)stringValue.get()));
-     return stringValue.release();
-   }
-   return nullptr;
--- 
-2.14.1
-
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index 0ff189261f42..9462075ec293 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libvisio))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
     external/libvisio/ubsan.patch \
-    external/libvisio/0001-fix-debug-build.patch.1 \
 ))
 
 ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch
index 7bba63fda7a1..c9ffbd98f4b6 100644
--- a/external/libvisio/ubsan.patch
+++ b/external/libvisio/ubsan.patch
@@ -4,8 +4,8 @@
      }
      if (U_SUCCESS(status) && conv)
      {
--      const char *src = (const char *)&characters[0];
-+      const char *src = (const char *)characters.data();
+-      const auto *src = (const char *)&characters[0];
++      const auto *src = (const char *)characters.data();
        const char *srcLimit = (const char *)src + characters.size();
        while (src < srcLimit)
        {
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c4a36fc0d8dc..e8849d22807c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -299,10 +299,10 @@
                     "dest-filename": "external/tarballs/ltm-1.0.zip"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz",
-                    "sha256": "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9",
+                    "url": "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz",
+                    "sha256": "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c",
                     "type": "file",
-                    "dest-filename": "external/tarballs/libvisio-0.1.6.tar.xz"
+                    "dest-filename": "external/tarballs/libvisio-0.1.7.tar.xz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz",