diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-08-28 11:12:06 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:51:48 +0100 |
commit | 31ad69f4ef87e5d262b7a14ec40fa8ab4e9ee257 (patch) | |
tree | 55199ee387d168f3b8baa0dc784c3b59d83e51ab /libvisio | |
parent | f0a9d2ec74bca5bc620ca9e815a0882203a96a99 (diff) |
Uploading libvisio 0.0.31, fixing fdo#68477
Base64 decoding in some boost versions throws on padding characters
(cherry picked from commit 710eb05b0fe7a4396dcec169d15c337d1664e9d4)
Conflicts:
download.lst
libvisio/UnpackedTarball_libvisio.mk
Change-Id: I9a9a43c2a7e55b6a6fca085302eae223bc8c1b13
Reviewed-on: https://gerrit.libreoffice.org/5658
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'libvisio')
-rw-r--r-- | libvisio/UnpackedTarball_visio.mk | 5 | ||||
-rw-r--r-- | libvisio/libvisio-0.0.30-msvc.patch.1 | 12 | ||||
-rw-r--r-- | libvisio/libvisio-wpx_seek_end.patch.1 | 14 |
3 files changed, 0 insertions, 31 deletions
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index 882a87c05367..aa9113bafd6d 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,visio,\ - libvisio/libvisio-0.0.30-msvc.patch.1 \ - libvisio/libvisio-wpx_seek_end.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libvisio/libvisio-0.0.30-msvc.patch.1 b/libvisio/libvisio-0.0.30-msvc.patch.1 deleted file mode 100644 index 448380629669..000000000000 --- a/libvisio/libvisio-0.0.30-msvc.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/lib/VSDContentCollector.cpp -+++ b/src/lib/VSDContentCollector.cpp -@@ -655,7 +655,8 @@ void libvisio::VSDContentCollector::_flushText() - { - // Insert duplicate - std::vector<VSDCharStyle>::iterator charIt = m_charFormats.begin() + charIndex; -- m_charFormats.insert(charIt, m_charFormats[charIndex]); -+ VSDCharStyle tmpCharFormat = m_charFormats[charIndex]; -+ m_charFormats.insert(charIt, tmpCharFormat); - m_charFormats[charIndex].charCount = paraCharCount; - m_charFormats[charIndex+1].charCount -= paraCharCount; - } diff --git a/libvisio/libvisio-wpx_seek_end.patch.1 b/libvisio/libvisio-wpx_seek_end.patch.1 deleted file mode 100644 index 55bbf5719259..000000000000 --- a/libvisio/libvisio-wpx_seek_end.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/lib/VSDZipStream.cpp -+++ b/src/lib/VSDZipStream.cpp -@@ -161,11 +161,7 @@ WPXInputStream *libvisio::VSDZipStream::getDocumentOLEStream(const char *name) - - bool libvisio::VSDZipStreamImpl::findCentralDirectoryEnd() - { --#if defined(LIBWPD_STREAM_VERSION_MAJOR) && defined(LIBWPD_STREAM_VERSION_MINOR) && defined(LIBWPD_STREAM_VERSION_REVISION) \ -- && (LIBWPD_STREAM_VERSION_MAJOR > 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 && (LIBWPD_STREAM_VERSION_MINOR > 9 \ -- || (LIBWPD_STREAM_VERSION_MINOR == 9 && LIBWPD_STREAM_VERSION_REVISION >= 5)))) - if (m_cdir_offset || m_input->seek(-1024, WPX_SEEK_END)) --#endif - m_input->seek(m_cdir_offset, WPX_SEEK_SET); - try - { |