diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 4 | ||||
| -rw-r--r-- | external/libvisio/ubsan.patch | 15 |
3 files changed, 2 insertions, 21 deletions
diff --git a/download.lst b/download.lst index 0b22720c9316..b79837f5cb38 100644 --- a/download.lst +++ b/download.lst @@ -148,8 +148,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 := 617f800ab7639fd76c062ab74896318e -export VISIO_TARBALL := libvisio-0.1.3.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 027c38e5b755..f9467c531296 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -13,10 +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/ubsan.patch \ -)) - ifeq ($(COM_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 16b0ec4bf71a..000000000000 --- 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) - { |