From e7c8f6e8f9bd5eb6d946f1461472e3e1a4d88438 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Wed, 6 Nov 2013 16:42:14 +0000 Subject: [PATCH] Add upstream patch to fix the build with libc++. --- editors/calligra/files/patch-git_3f2bf6c | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 editors/calligra/files/patch-git_3f2bf6c diff --git a/editors/calligra/files/patch-git_3f2bf6c b/editors/calligra/files/patch-git_3f2bf6c new file mode 100644 index 000000000000..662bacab9291 --- /dev/null +++ b/editors/calligra/files/patch-git_3f2bf6c @@ -0,0 +1,25 @@ +commit 3f2bf6cf65a280b449e3ad854d3a6c4ce92208bc +Author: Yue Liu +Date: Sat Oct 12 12:10:40 2013 -0400 + + fix osx compile issue + +--- filters/words/msword-odf/wv2/src/word97_helper.cpp ++++ filters/words/msword-odf/wv2/src/word97_helper.cpp +@@ -31,6 +31,7 @@ + #include // memcpy + #include + #include // std::bind2nd for gcc 2.9x ++#include + + #include "wvlog.h" + +@@ -730,7 +731,7 @@ namespace + { + m_center = readS16( ptr + index * sizeof( S16 ) ); + // A negative value doesn't make sense here, right? Hmmm +- m_plusMinus = std::abs( readS16( ptr + itbdDelMax * sizeof( S16 ) + index * sizeof( S16 ) ) ); ++ m_plusMinus = std::abs( (int)( readS16( ptr + itbdDelMax * sizeof( S16 ) + index * sizeof( S16 ) ) ) ); + } + + bool contains( S16 position ) const { return m_center - m_plusMinus <= position && m_center + m_plusMinus >= position; }