Use the WPX_SEEK_SET inconditionally

Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c

libcdr/UnpackedTarball_libcdr.mk

@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
+	libcdr/libcdr-wpx_seek_end.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:

libcdr/libcdr-wpx_seek_end.patch.1

+--- 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
+   {

libvisio/UnpackedTarball_libvisio.mk

@@ -13,6 +13,7 @@ $(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:

libvisio/libvisio-wpx_seek_end.patch.1

+--- 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
+   {