summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2014-04-04 15:45:36 +0200
committerTor Lillqvist <tml@collabora.com>2014-04-08 11:11:51 +0300
commit1fcb6a8fe5ec6779d17bc6272894bdfebbbcf786 (patch)
tree7068d96ac550535fa344dce1dd8c3a841a21f577 /external
parent1cfbc0ebb8198f5ebd966968086c121d83442a3a (diff)
Uploading libcdr-0.0.15: Support for CorelDraw x7
(cherry picked from commit 32f301f5a64d8ff7815cf88858fc8a87cb9ad76a) Conflicts: download.lst Change-Id: I1cc6c6ab39ec27dbf08c2019c7dd7f8f29537520 Reviewed-on: https://gerrit.libreoffice.org/8845 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'external')
-rw-r--r--external/libcdr/UnpackedTarball_libcdr.mk4
-rw-r--r--external/libcdr/libcdr-wpx_seek_end.patch.114
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
- {