diff options
| author | David Tardon <dtardon@redhat.com> | 2019-08-17 17:06:07 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2019-08-17 18:36:51 +0200 |
| commit | d83472ab6fde650772307f7f93a0a4b96e7ea6a8 (patch) | |
| tree | e8b773b56d177308e69c54408d481589d7c5c540 /external | |
| parent | 2a733f30cc994ead8cc3d1e64947bba6e8fe3924 (diff) | |
upload libvisio 0.1.7
Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033
Reviewed-on: https://gerrit.libreoffice.org/77640
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libvisio/0001-fix-debug-build.patch.1 | 40 | ||||
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 1 | ||||
| -rw-r--r-- | external/libvisio/ubsan.patch | 4 |
3 files changed, 2 insertions, 43 deletions
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@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) { |