download.lst | 4 ++--
libvisio/UnpackedTarball_visio.mk | 5 -----
libvisio/libvisio-0.0.30-msvc.patch.1 | 12 ------------
libvisio/libvisio-wpx_seek_end.patch.1 | 14 --------------
4 files changed, 2 insertions(+), 33 deletions(-)
New commits:
commit f72943062d5556c4a861e8ec225069295098212a
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Aug 28 11:12:06 2013 +0200
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 <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/download.lst b/download.lst
index 7c9dbd5..07e5fcf 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export CDR_TARBALL := libcdr-0.0.14.tar.bz2
MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
export MSPUB_TARBALL := libmspub-0.0.6.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
export AFMS_TARBALL :=
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
export APACHE_COMMONS_CODEC_TARBALL :=
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
diff --git a/libvisio/UnpackedTarball_visio.mk
b/libvisio/UnpackedTarball_visio.mk
index 882a87c0..aa9113b 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 4483806..0000000
--- 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 55bbf57..0000000
--- 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
- {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
