external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
| 56 ++++++++++
external/libwps/UnpackedTarball_libwps.mk
| 4
2 files changed, 60 insertions(+)
New commits:
commit 74c35a46c813b00ae4f1d9686fa07e60e83d0992
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 26 14:29:19 2018 +0200
fix asan build
Change-Id: I83a0832ed180a57517d3344e3bc9ada482f0fc70
diff --git
a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
new file mode 100644
index 000000000000..46983dd9eed2
--- /dev/null
+++
b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
@@ -0,0 +1,56 @@
+From 9181ad021cf1c200bc80edb9f5a6df5b780be046 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Thu, 26 Apr 2018 14:24:55 +0200
+Subject: [PATCH] avoid name clash with MultiplanParser from libmwaw
+
+---
+ src/lib/Multiplan.cpp | 5 ++++-
+ src/lib/Multiplan.h | 5 +++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
+index 278f699..26ceca3 100644
+--- a/src/lib/Multiplan.cpp
++++ b/src/lib/Multiplan.cpp
+@@ -44,7 +44,8 @@
+
+ #include "Multiplan.h"
+
+-using namespace libwps;
++namespace libwps
++{
+
+ //! Internal: namespace to define internal class of MultiplanParser
+ namespace MultiplanParserInternal
+@@ -2912,4 +2913,6 @@ RVNGInputStreamPtr
MultiplanParser::decodeStream(RVNGInputStreamPtr input)
+ return res;
+ }
+
++}
++
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+diff --git a/src/lib/Multiplan.h b/src/lib/Multiplan.h
+index 87e0565..83c83f2 100644
+--- a/src/lib/Multiplan.h
++++ b/src/lib/Multiplan.h
+@@ -34,6 +34,9 @@
+
+ #include "WKSParser.h"
+
++namespace libwps
++{
++
+ namespace MultiplanParserInternal
+ {
+ struct State;
+@@ -127,5 +130,7 @@ protected:
+ std::shared_ptr<MultiplanParserInternal::State> m_state;
+ };
+
++}
++
+ #endif /* WPS4_H */
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+--
+2.14.3
+
diff --git a/external/libwps/UnpackedTarball_libwps.mk
b/external/libwps/UnpackedTarball_libwps.mk
index d712f25406bd..d82b2be75783 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,4 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
endif
endif
+$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+
external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
\
+))
+
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
