diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/libcdr/UnpackedTarball_libcdr.mk | 4 | ||||
| -rw-r--r-- | external/libcdr/libcdr-wpx_seek_end.patch.1 | 14 |
2 files changed, 0 insertions, 18 deletions
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index dff6a573a4c6..a91bc8e907ca 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr)) $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\ - external/libcdr/libcdr-wpx_seek_end.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libcdr/libcdr-wpx_seek_end.patch.1 b/external/libcdr/libcdr-wpx_seek_end.patch.1 deleted file mode 100644 index 67b8587996f8..000000000000 --- a/external/libcdr/libcdr-wpx_seek_end.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 - { |