From owner-svn-ports-head@FreeBSD.ORG  Wed Nov  6 16:42:14 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CD02F1C9;
 Wed,  6 Nov 2013 16:42:14 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BA2682C0C;
 Wed,  6 Nov 2013 16:42:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6GgEK4054897;
 Wed, 6 Nov 2013 16:42:14 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6GgE7r054896;
 Wed, 6 Nov 2013 16:42:14 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201311061642.rA6GgE7r054896@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Wed, 6 Nov 2013 16:42:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333012 - head/editors/calligra/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2013 16:42:14 -0000

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; }