download.lst | 4 ++--
libmwaw/UnpackedTarball_libmwaw.mk | 5 -----
libmwaw/libmwaw-0.1.9.patch.1 | 15 ---------------
libmwaw/libmwaw-infinite-loop.patch.1 | 32 --------------------------------
4 files changed, 2 insertions(+), 54 deletions(-)
New commits:
commit a1239f7a1a8aac82c3599fbdfe826cb67baae9c7
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Thu Jun 27 14:57:42 2013 +0200
Uploading libmwaw 0.1.10 and dumping unneeded patches
Change-Id: I837b885fb88ccbc1e7980712be4a3342575b3770
(cherry picked from commit d63bd6914f479ea4cd718b6f0a26b1edfc141562)
Reviewed-on: https://gerrit.libreoffice.org/4588
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/download.lst b/download.lst
index d0c6d45..9df006b 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export CDR_TARBALL := libcdr-0.0.14.tar.bz2
MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5
-export MWAW_TARBALL := libmwaw-0.1.9.tar.bz2
+MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036
+export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2
VISIO_MD5SUM := 05574c2ec54dd0c29d75cacdf9419f44
export VISIO_TARBALL := libvisio-0.0.28.tar.bz2
diff --git a/libmwaw/UnpackedTarball_libmwaw.mk
b/libmwaw/UnpackedTarball_libmwaw.mk
index a17961d..96fe9df 100644
--- a/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
- libmwaw/libmwaw-0.1.9.patch.1 \
- libmwaw/libmwaw-infinite-loop.patch.1 \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/libmwaw-0.1.9.patch.1 b/libmwaw/libmwaw-0.1.9.patch.1
deleted file mode 100644
index e5eb6da..0000000
--- a/libmwaw/libmwaw-0.1.9.patch.1
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/lib/MWAWTable.hxx
-+++ b/src/lib/MWAWTable.hxx
-@@ -117,7 +117,11 @@ protected:
- - c2.m_cell->box().size()[m_coord];
- if (diffF < 0) return true;
- if (diffF > 0) return false;
-- return ssize_t(c1.m_cell) < ssize_t(c2.m_cell);
-+#ifdef _WIN64
-+ return __int64(c1.m_cell) < __int64(c2.m_cell);
-+#else
-+ return long(c1.m_cell) < long(c2.m_cell);
-+#endif
- }
-
- //! the coord to compare
diff --git a/libmwaw/libmwaw-infinite-loop.patch.1
b/libmwaw/libmwaw-infinite-loop.patch.1
deleted file mode 100644
index 9c8e3a8..0000000
--- a/libmwaw/libmwaw-infinite-loop.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
-fix infinite loop in findCentralDirectoryEnd
-
-WPXSvInputStreamImpl::seek returns -1 if it catches an exception
-
---- libmwaw/src/lib/MWAWZipStream.cxx 2013-06-18 00:37:57.208657845 +0200
-+++ libmwaw/src/lib/MWAWZipStream.cxx 2013-06-18 00:48:20.971665257 +0200
-@@ -258,18 +258,20 @@
-
- static bool findCentralDirectoryEnd(WPXInputStream *input)
- {
-- input->seek(0, WPX_SEEK_SET);
-+ // seek returns -1 both on error and on seek to position post-the-end
-+ int ret = input->seek(0, WPX_SEEK_SET);
- try {
-- while (!input->atEOS())
-- input->seek(1024, WPX_SEEK_CUR);
-+ while (-1 != ret && !input->atEOS())
-+ ret = input->seek(1024, WPX_SEEK_CUR);
- input->seek(-1024, WPX_SEEK_CUR);
-- while (!input->atEOS()) {
-+ ret = 0; // perhaps it's smaller than 1024?
-+ while (-1 != ret && !input->atEOS()) {
- unsigned signature = getInt(input);
- if (signature == CDIR_END_SIG) {
- input->seek(-4, WPX_SEEK_CUR);
- return true;
- } else
-- input->seek(-3, WPX_SEEK_CUR);
-+ ret = input->seek(-3, WPX_SEEK_CUR);
- }
- } catch (...) {
- return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
