[Libreoffice-commits] core.git: download.lst external/libvisio

[David Tardon]

 download.lst                                   |    4 +-
 external/libvisio/0001-fix-debug-build.patch.1 |   40 +++++++++++++++++++++++++
 external/libvisio/ExternalProject_libvisio.mk  |    2 -
 external/libvisio/UnpackedTarball_libvisio.mk  |    1 
 external/libvisio/ubsan.patch                  |    8 -----
 5 files changed, 44 insertions(+), 11 deletions(-)

New commits:
commit 1bad74aca003fa6a7a376ef9498b9ba6c64b6223
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Oct 22 21:27:15 2017 +0200

    upload libvisio 0.1.6
    
    Change-Id: I7864603e47e9f9337323ff4eed4e08f20bf5a756
    Reviewed-on: https://gerrit.libreoffice.org/43703
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index 9a2cdc5de70f..f254a7cb27fb 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ export SWING_SHA256SUM := 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 export UCPP_SHA256SUM := 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-export VISIO_SHA256SUM := b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e
-export VISIO_TARBALL := libvisio-0.1.5.tar.bz2
+export VISIO_SHA256SUM := fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9
+export VISIO_TARBALL := libvisio-0.1.6.tar.xz
 export WPD_SHA256SUM := 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610
 export WPD_VERSION_MICRO := 2
 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
new file mode 100644
index 000000000000..4146e6e8bfe7
--- /dev/null
+++ b/external/libvisio/0001-fix-debug-build.patch.1
@@ -0,0 +1,40 @@
+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/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 2f212ceac249..da34277cbf9e 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
 	icu \
 	libxml2 \
 	revenge \
-	zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
@@ -31,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			--enable-static \
 			--disable-shared \
 			--without-docs \
+			--disable-tests \
 			--disable-tools \
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index eba43f3b7a6e..1ab8b392c4e8 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,6 +17,7 @@ $(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 ($(COM_IS_CLANG),TRUE)
diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch
index ec67b5c9cd4a..7bba63fda7a1 100644
--- a/external/libvisio/ubsan.patch
+++ b/external/libvisio/ubsan.patch
@@ -9,11 +9,3 @@
        const char *srcLimit = (const char *)src + characters.size();
        while (src < srcLimit)
        {
-@@ -3285,6 +3285,7 @@
-   _handleLevelChange(level);
-   librevenge::RVNGString text;
-   std::vector<unsigned char> tmpData(layerMem.m_data.size());
-+  if (!layerMem.m_data.empty())
-   memcpy(&tmpData[0], layerMem.m_data.getDataBuffer(), layerMem.m_data.size());
-   appendCharacters(text, tmpData, layerMem.m_format);
-