[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcdr/libcdr-wpx_seek_end.patch.1 libcdr/UnpackedTarball_cdr.mk libvisio/libvisio-wpx_seek_end.patch.1 libvisio/UnpackedTarball_visio.mk

[Fridrich Å trba]

 libcdr/UnpackedTarball_cdr.mk          |    1 +
 libcdr/libcdr-wpx_seek_end.patch.1     |   14 ++++++++++++++
 libvisio/UnpackedTarball_visio.mk      |    1 +
 libvisio/libvisio-wpx_seek_end.patch.1 |   14 ++++++++++++++
 4 files changed, 30 insertions(+)

New commits:
commit ce89313670c38328db49542a67cbda63ee20a7a6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jul 25 16:25:00 2013 +0200

    Use the WPX_SEEK_SET inconditionally
    
    (cherry picked from commit e4906561219fe88345ace8aa4d6f48cbb01262d8)
    
    Conflicts:
    	libcdr/UnpackedTarball_libcdr.mk
    	libvisio/UnpackedTarball_libvisio.mk
    
    Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c
    Reviewed-on: https://gerrit.libreoffice.org/5105
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 8affb0b..cea4b29 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cdr,\
 	libcdr/msvc2008.patch.1 \
+	libcdr/libcdr-wpx_seek_end.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-wpx_seek_end.patch.1 b/libcdr/libcdr-wpx_seek_end.patch.1
new file mode 100644
index 0000000..67b8587
--- /dev/null
+++ b/libcdr/libcdr-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/CDRZipStream.cpp
++++ b/src/lib/CDRZipStream.cpp
+@@ -160,11 +160,7 @@ WPXInputStream *libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
+ 
+ bool libcdr::CDRZipStreamImpl::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
+   {
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
index 20ed993..882a87c0 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -13,6 +13,7 @@ $(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-wpx_seek_end.patch.1 b/libvisio/libvisio-wpx_seek_end.patch.1
new file mode 100644
index 0000000..55bbf57
--- /dev/null
+++ b/libvisio/libvisio-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- 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
+   {