Date: Wed, 6 Nov 2013 16:42:14 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333012 - head/editors/calligra/files Message-ID: <201311061642.rA6GgE7r054896@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Nov 6 16:42:14 2013 New Revision: 333012 URL: http://svnweb.freebsd.org/changeset/ports/333012 Log: Add upstream patch to fix the build with libc++. Added: head/editors/calligra/files/patch-git_3f2bf6c (contents, props changed) Added: head/editors/calligra/files/patch-git_3f2bf6c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/calligra/files/patch-git_3f2bf6c Wed Nov 6 16:42:14 2013 (r333012) @@ -0,0 +1,25 @@ +commit 3f2bf6cf65a280b449e3ad854d3a6c4ce92208bc +Author: Yue Liu <yue.liu@mail.com> +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 <string.h> // memcpy + #include <algorithm> + #include <functional> // std::bind2nd for gcc 2.9x ++#include <cstdlib> + + #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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311061642.rA6GgE7r054896>