4 files changed, 31 insertions, 27 deletions
diff --git a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
deleted file mode 100644
index 2036fa869f86..000000000000
--- a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Wed, 15 Nov 2017 13:15:44 +0100
-Subject: [PATCH] fix call of explicit ctor
-
----
- src/lib/libmwaw_internal.hxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
-index 2875a0fb..b844a9d5 100644
---- a/src/lib/libmwaw_internal.hxx
-+++ b/src/lib/libmwaw_internal.hxx
-@@ -1027,7 +1027,7 @@ public:
-   }
-   //! generic constructor
-   template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
--    : m_data(p.min(), p.max())
-+    : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
-   {
-   }
- 
--- 
-2.14.3
-
diff --git a/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
new file mode 100644
index 000000000000..e33f2a19d560
--- /dev/null
+++ b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
@@ -0,0 +1,27 @@
+From 4458a5e93736a324251a356362f0e80e7c42d5be Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Wed, 25 Apr 2018 12:53:37 +0200
+Subject: [PATCH] ssize_t is not std type
+
+---
+ src/lib/WriterPlsParser.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/WriterPlsParser.cxx b/src/lib/WriterPlsParser.cxx
+index 00dc969b..33b1fa49 100644
+--- a/src/lib/WriterPlsParser.cxx
++++ b/src/lib/WriterPlsParser.cxx
+@@ -316,8 +316,8 @@ bool WindowsInfo::getColumnLimitsFor(int line, std::vector<int> &listPos)
+     if (m_columns[i].m_firstLine == line+2) {
+       numCols=m_columns[i].m_numCol;
+       firstColumn = i;
+-      if (numCols > ssize_t(numColumns - firstColumn))
+-        numCols = int(ssize_t(numColumns - firstColumn));
++      if (numCols > int(unsigned(numColumns - firstColumn)))
++        numCols = int(unsigned(numColumns - firstColumn));
+       if (numCols <= 1 || m_columns[i].m_col != 1) return false;
+       break;
+     }
+-- 
+2.14.3
+
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 91280f47460d..0b28836cdb80 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -156,6 +156,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/MsWrdStruct \
 	UnpackedTarball/libmwaw/src/lib/MsWrdText \
 	UnpackedTarball/libmwaw/src/lib/MsWrdTextStyles \
+	UnpackedTarball/libmwaw/src/lib/MultiplanParser \
 	UnpackedTarball/libmwaw/src/lib/NisusWrtGraph \
 	UnpackedTarball/libmwaw/src/lib/NisusWrtParser \
 	UnpackedTarball/libmwaw/src/lib/NisusWrtStruct \
@@ -185,6 +186,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/StyleParser \
 	UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
 	UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
+	UnpackedTarball/libmwaw/src/lib/WingzGraph \
 	UnpackedTarball/libmwaw/src/lib/WingzParser \
 	UnpackedTarball/libmwaw/src/lib/WriteNowEntry \
 	UnpackedTarball/libmwaw/src/lib/WriteNowParser \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 851b39bc66d0..bb39a27382b9 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 ))
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-    external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 \
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
+	external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: