[Libreoffice-commits] core.git: download.lst external/libcdr

[Fridrich Å trba]

 download.lst                                |    4 ++--
 external/libcdr/UnpackedTarball_libcdr.mk   |    4 ----
 external/libcdr/libcdr-wpx_seek_end.patch.1 |   14 --------------
 3 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 32f301f5a64d8ff7815cf88858fc8a87cb9ad76a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Apr 4 15:45:36 2014 +0200

    Uploading libcdr-0.0.15: Support for CorelDraw x7
    
    Change-Id: I1cc6c6ab39ec27dbf08c2019c7dd7f8f29537520

diff --git a/download.lst b/download.lst
index 733f4c7..09b64ac 100644
--- a/download.lst
+++ b/download.lst
@@ -4,8 +4,8 @@ APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d
 export APR_TARBALL := apr-1.4.8.tar.gz
 APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3
 export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz
-CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
-export CDR_TARBALL := libcdr-0.0.14.tar.bz2
+CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998
+export CDR_TARBALL := libcdr-0.0.15.tar.bz2
 COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
 export COINMP_TARBALL := CoinMP-1.7.6.tgz
 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index dff6a57..a91bc8e 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 67b8587..0000000
--- 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
-   {