From owner-svn-ports-head@freebsd.org Thu May 26 06:01:51 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 067E3B4A9B6; Thu, 26 May 2016 06:01:51 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2BD118B4; Thu, 26 May 2016 06:01:50 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4Q61nmb087055; Thu, 26 May 2016 06:01:49 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4Q61naB087053; Thu, 26 May 2016 06:01:49 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201605260601.u4Q61naB087053@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Thu, 26 May 2016 06:01:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415875 - in head/editors: openoffice-4/files openoffice-devel/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.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2016 06:01:51 -0000 Author: truckman Date: Thu May 26 06:01:49 2016 New Revision: 415875 URL: https://svnweb.freebsd.org/changeset/ports/415875 Log: Fix build of openoffice-4 and openoffice-devel with libc++ 3.8.0. Openffice defines its own overloaded variant of round(), which is only different in return type from the 'real' round() from , so it is ambiguous (in the C++ lookup sense). Fix this by renaming the custom round() to round_(), and using a define to minimize needed changes in the code. PR: 209588 Submitted by: dim Added: head/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx (contents, props changed) head/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx (contents, props changed) Added: head/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx Thu May 26 06:01:49 2016 (r415875) @@ -0,0 +1,14 @@ +--- vcl/source/glyphs/graphite_layout.cxx.orig 2014-02-25 08:33:06 UTC ++++ vcl/source/glyphs/graphite_layout.cxx +@@ -107,9 +107,10 @@ namespace + typedef ext_std::pair glyph_range_t; + typedef ext_std::pair glyph_set_range_t; + +- inline long round(const float n) { ++ inline long round_(const float n) { + return long(n + (n < 0 ? -0.5 : 0.5)); + } ++#define round round_ + + + template Added: head/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx Thu May 26 06:01:49 2016 (r415875) @@ -0,0 +1,14 @@ +--- vcl/source/glyphs/graphite_layout.cxx.orig 2014-02-25 08:33:06 UTC ++++ vcl/source/glyphs/graphite_layout.cxx +@@ -107,9 +107,10 @@ namespace + typedef ext_std::pair glyph_range_t; + typedef ext_std::pair glyph_set_range_t; + +- inline long round(const float n) { ++ inline long round_(const float n) { + return long(n + (n < 0 ? -0.5 : 0.5)); + } ++#define round round_ + + + template