diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-08-28 11:12:06 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-08-28 10:08:18 +0000 |
| commit | 34e0cf11ab660732dd4894566d978d7e3f936c74 (patch) | |
| tree | 87d8c9081f4d840a52262f49f73cd3cb14af59ed /libvisio | |
| parent | c337a441734a4d9ebf6f35df7d1aa206ad2adfbe (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
Change-Id: I9a9a43c2a7e55b6a6fca085302eae223bc8c1b13
Reviewed-on: https://gerrit.libreoffice.org/5656
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/UnpackedTarball_libvisio.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_libvisio.mk b/libvisio/UnpackedTarball_libvisio.mk index 64f2b754952c..e4c0561f72f8 100644 --- a/libvisio/UnpackedTarball_libvisio.mk +++ b/libvisio/UnpackedTarball_libvisio.mk @@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio)) $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ - 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 - { |