Date: Fri, 8 May 2015 16:04:21 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385793 - in head/editors/openoffice-devel: . files Message-ID: <201505081604.t48G4LFQ048237@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Fri May 8 16:04:20 2015 New Revision: 385793 URL: https://svnweb.freebsd.org/changeset/ports/385793 Log: Resurrect the part of patch-i114430 that was not accepted upstream. Submitted by: pfg Approved by: mat (mentor, implicit) MFH: 2015Q2 Added: head/editors/openoffice-devel/files/patch-i114430 - copied, changed from r385505, head/editors/openoffice-devel/files/patch-i114430 Modified: head/editors/openoffice-devel/Makefile Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Fri May 8 15:58:38 2015 (r385792) +++ head/editors/openoffice-devel/Makefile Fri May 8 16:04:20 2015 (r385793) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -#PORTREVISION= 1 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= editors java MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ Copied and modified: head/editors/openoffice-devel/files/patch-i114430 (from r385505, head/editors/openoffice-devel/files/patch-i114430) ============================================================================== --- head/editors/openoffice-devel/files/patch-i114430 Wed May 6 06:37:47 2015 (r385505, copy source) +++ head/editors/openoffice-devel/files/patch-i114430 Fri May 8 16:04:20 2015 (r385793) @@ -1,90 +1,8 @@ -Index: sal/inc/rtl/math.h -=================================================================== ---- sal/inc/rtl/math.h (revision 1447988) -+++ sal/inc/rtl/math.h (working copy) -@@ -396,6 +396,21 @@ - */ - double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C(); - -+/** Similar to pow() with stricter exception handling for indeterminate values. -+ -+ powr is specified in the IEEE 754 - 2008 Floating Point Standard. -+ -+ @param fValue -+ The value to be raised. -+ -+ @param fExp -+ The exponent. -+ -+ @return -+ powr(fValue, fExp) -+ */ -+double SAL_CALL rtl_math_powr(double fValue, double fExp) SAL_THROW_EXTERN_C(); -+ - /** Rounds value to 15 significant decimal digits. - - @param fValue -Index: sal/inc/rtl/math.hxx -=================================================================== ---- sal/inc/rtl/math.hxx (revision 1447988) -+++ sal/inc/rtl/math.hxx (working copy) -@@ -186,6 +186,13 @@ - return rtl_math_pow10Exp(fValue, nExp); - } - -+/** A wrapper around rtl_math_powr. -+ */ -+inline double powr(double fValue, double fExp) -+{ -+ return rtl_math_powr(fValue, fExp); -+} -+ - /** A wrapper around rtl_math_approxValue. - */ - inline double approxValue(double fValue) -Index: sal/rtl/source/math.cxx -=================================================================== ---- sal/rtl/source/math.cxx (revision 1447988) -+++ sal/rtl/source/math.cxx (working copy) -@@ -1113,7 +1113,20 @@ - return (fe-1.0) * fValue / log(fe); - } - -+double SAL_CALL rtl_math_powr( double fValue, double fExp ) SAL_THROW_EXTERN_C() -+{ -+ if ((fValue == 0.0 && fExp == 0.0) || -+ (rtl::math::isInf( fExp ) && !rtl::math::isSignBitSet( fExp )) || -+ (rtl::math::isInf( fValue ) && !rtl::math::isSignBitSet( fValue ))) -+ { -+ double fResult; -+ ::rtl::math::setNan( &fResult ); -+ return fResult; -+ } -+ return pow(fValue, fExp); -+} - -+ - double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C() - { - // Use volatile because a compiler may be too smart "optimizing" the -Index: sal/util/sal.map -=================================================================== ---- sal/util/sal.map (revision 1447988) -+++ sal/util/sal.map (working copy) -@@ -629,6 +629,8 @@ - global: - osl_loadAsciiModule; - osl_loadAsciiModuleRelative; -+ -+ rtl_math_powr; - } UDK_3.11; - - PRIVATE_1.0 { Index: sc/source/core/tool/interpr5.cxx =================================================================== ---- sc/source/core/tool/interpr5.cxx (revision 1447988) +--- sc/source/core/tool/interpr5.cxx (revision 1678278) +++ sc/source/core/tool/interpr5.cxx (working copy) -@@ -1611,14 +1611,14 @@ +@@ -1611,7 +1611,7 @@ if (bFlag) { for ( SCSIZE i = 0; i < nCount; i++ ) if (pMat->IsValue(i)) @@ -93,6 +11,7 @@ Index: sc/source/core/tool/interpr5.cxx else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } +@@ -1618,7 +1618,7 @@ else { for ( SCSIZE i = 0; i < nCount; i++ ) if (pMat->IsValue(i))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505081604.t48G4LFQ048237>