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

[David Tardon]

 download.lst                                  |    4 ++--
 external/libvisio/UnpackedTarball_libvisio.mk |    1 -
 external/libvisio/vsd-msvc-max.patch.1        |   19 -------------------
 3 files changed, 2 insertions(+), 22 deletions(-)

New commits:
commit e783cc71eec1f581835a84560904b948f464b435
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jul 25 09:19:54 2015 +0200

    upload libvisio 0.1.3
    
    Change-Id: I022e036c4a27f3c3931c19b0df0e64c6c0dd25a0

diff --git a/download.lst b/download.lst
index 7efe8e4..a285ba1 100644
--- a/download.lst
+++ b/download.lst
@@ -145,8 +145,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 := 617f800ab7639fd76c062ab74896318e
+export VISIO_TARBALL := libvisio-0.1.3.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 4c55ece..9b555d4 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -14,7 +14,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 \
 ))
 
diff --git a/external/libvisio/vsd-msvc-max.patch.1 b/external/libvisio/vsd-msvc-max.patch.1
deleted file mode 100644
index 7d22ea1..0000000
--- a/external/libvisio/vsd-msvc-max.patch.1
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/lib/VSDContentCollector.cpp
-+++ b/src/lib/VSDContentCollector.cpp
-@@ -2256,14 +2256,14 @@
-     styleProps.insert("draw:marker-start-viewbox", _linePropertiesMarkerViewbox(style.startMarker));
-     styleProps.insert("draw:marker-start-path", _linePropertiesMarkerPath(style.startMarker));
-     double w =  m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
--    styleProps.insert("draw:marker-start-width", std::max(w, 0.05));
-+    styleProps.insert("draw:marker-start-width", (std::max)(w, 0.05));
-   }
-   if (style.endMarker > 0)
-   {
-     styleProps.insert("draw:marker-end-viewbox", _linePropertiesMarkerViewbox(style.endMarker));
-     styleProps.insert("draw:marker-end-path", _linePropertiesMarkerPath(style.endMarker));
-     double w =  m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
--    styleProps.insert("draw:marker-end-width", std::max(w, 0.05));
-+    styleProps.insert("draw:marker-end-width", (std::max)(w, 0.05));
-   }
- 
-   int dots1 = 0;