[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - download.lst external/libvisio

[Fridrich Štrba]

 download.lst                                  |    4 ++--
 external/libvisio/UnpackedTarball_libvisio.mk |    7 -------
 external/libvisio/ubsan.patch                 |   15 ---------------
 3 files changed, 2 insertions(+), 24 deletions(-)

New commits:
commit 3998ab1b6a055c7d6c2ff6c3869d07295b8017a3
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Wed Dec 23 15:31:14 2015 +0100

    Upload libvisio 0.1.4
    
    (cherry picked from commit ce014ac76678f186da27faadc973af3eb253c817)
    
    Conflicts:
    	download.lst
    	external/libvisio/UnpackedTarball_libvisio.mk
    
    Change-Id: Ia4cb506a95a150b8106187719e9104760409dea6

diff --git a/download.lst b/download.lst
index ef5a69b..77a2dfb 100644
--- a/download.lst
+++ b/download.lst
@@ -135,8 +135,8 @@ export SERF_TARBALL := serf-1.2.1.tar.bz2
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 export VIGRA_TARBALL := d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
-export VISIO_MD5SUM := 726c1f5be65eb7d649e0d48b63d920e7
-export VISIO_TARBALL := libvisio-0.1.1.tar.bz2
+export VISIO_MD5SUM := 3f829e7e5f7304da37446938bb0df1f5
+export VISIO_TARBALL := libvisio-0.1.4.tar.bz2
 export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7
 export WPD_TARBALL := libwpd-0.10.0.tar.bz2
 export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index db83360..47421b4 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -13,13 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
-       external/libvisio/vsd-msvc-max.patch.1 \
-       external/libvisio/ubsan.patch \
-       external/libvisio/tdf-92270-VSDX-theme-color-import-fix.patch \
-       external/libvisio/tdf-92271-fix-VSDX-char-background-handling.patch \
-))
-
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch
deleted file mode 100644
index 16b0ec4..0000000
--- a/external/libvisio/ubsan.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/lib/VSDParser.cpp
-+++ src/lib/VSDParser.cpp
-@@ -1104,7 +1104,11 @@
-   input->seek(1, librevenge::RVNG_SEEK_CUR);
-   double scale = readDouble(input);
-   input->seek(1, librevenge::RVNG_SEEK_CUR);
--  scale /= readDouble(input);
-+  double scaleDenom = readDouble(input);
-+  if (scaleDenom != 0)
-+  {
-+    scale /= scaleDenom;
-+  }
- 
-   if (m_isStencilStarted && m_currentStencil)
-   {