Uploading libmwaw 0.1.10 and dumping unneeded patches

Change-Id: I837b885fb88ccbc1e7980712be4a3342575b3770

3 files changed, 0 insertions, 52 deletions

diff --git a/libmwaw/UnpackedTarball_libmwaw.mk b/libmwaw/UnpackedTarball_libmwaw.mk
index a17961d7d2bf..96fe9df6afa0 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 e5eb6da8ecf8..000000000000
--- 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 9c8e3a8b413e..000000000000
--- 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;