diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -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 |
4 files changed, 2 insertions, 33 deletions
diff --git a/download.lst b/download.lst index b1382f7da40d..092aecb8daec 100644 --- a/download.lst +++ b/download.lst @@ -4,8 +4,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036 export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2 -VISIO_MD5SUM := 9d9eb3ae6bee763c161228b2b12e25f8 -export VISIO_TARBALL := libvisio-0.0.30.tar.bz2 +VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40 +export VISIO_TARBALL := libvisio-0.0.31.tar.bz2 FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7 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 - { |