From owner-svn-ports-all@freebsd.org Thu Oct 8 01:09:40 2015 Return-Path: Delivered-To: svn-ports-all@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 61C649D0CDB; Thu, 8 Oct 2015 01:09:40 +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 382901098; Thu, 8 Oct 2015 01:09:40 +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 t9819db0037900; Thu, 8 Oct 2015 01:09:39 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9819d6Y037897; Thu, 8 Oct 2015 01:09:39 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201510080109.t9819d6Y037897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Thu, 8 Oct 2015 01:09:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398790 - in head/editors/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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2015 01:09:40 -0000 Author: truckman Date: Thu Oct 8 01:09:38 2015 New Revision: 398790 URL: https://svnweb.freebsd.org/changeset/ports/398790 Log: Temporarily downgrade the openoffice-devel port from the upstream trunk branch to 4.1.2-RC1 in order to give the latter wider exposure before 4.1.2 is released. Add this missing missing bits of patch-i114430 that were committed to trunk upstream but that are not in 4.1.2-RC1. Removing --enable-symbols=small from CONFIGURE_ARGS allows us to avoid the need to use ${STRIP_CMD}. Added: head/editors/openoffice-devel/files/patch-i114430-41x (contents, props changed) Modified: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Wed Oct 7 22:03:37 2015 (r398789) +++ head/editors/openoffice-devel/Makefile Thu Oct 8 01:09:38 2015 (r398790) @@ -4,9 +4,9 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} PORTREVISION= 1 -PORTEPOCH= 3 +PORTEPOCH= 4 CATEGORIES= editors java -MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ +MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r1705606/source/ \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ LOCAL/truckman/openoffice:snap,extsrc .if defined(LANG_PKGNAME) @@ -98,12 +98,12 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf AOOVERSION1= 4 -AOOVERSION2= 2 -AOOVERSION3= 0 +AOOVERSION2= 1 +AOOVERSION3= 2 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO420m1\(Build:9800\) -SVNREVISION= 1704217 -#AOORC=rc3 +AOOTAG= AOO412m1\(Build:9780\) +SVNREVISION= 1705575 +AOORC=rc1 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} @@ -261,7 +261,6 @@ CONFIGURE_ARGS+= \ --with-system-sane \ --with-system-serf \ --with-system-stdlibs \ - --enable-symbols=small \ --without-stlport \ --with-vendor="FreeBSD ports system" \ --enable-verbose \ @@ -413,10 +412,6 @@ do-install: cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; \ ${INSTALL_DATA} ${AOOEXTENSIONS} \ ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/ - @cd ${STAGEDIR}${OOPATH}/program ; \ - ${ECHO_CMD} "stripping executables and shared libraries" ; \ - ${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \ - regview *.so* *.bin ${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; ${REINPLACE_CMD} \ -e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \ Modified: head/editors/openoffice-devel/distinfo ============================================================================== --- head/editors/openoffice-devel/distinfo Wed Oct 7 22:03:37 2015 (r398789) +++ head/editors/openoffice-devel/distinfo Thu Oct 8 01:09:38 2015 (r398790) @@ -1,5 +1,5 @@ -SHA256 (openoffice/apache-openoffice-r1704217-src.tar.xz) = 52b0c1c54cfd0aa9ec1bd27a99c2c6240fd4279171bcf6025383fe7e0d55f24b -SIZE (openoffice/apache-openoffice-r1704217-src.tar.xz) = 215145548 +SHA256 (openoffice/apache-openoffice-4.1.2-r1705575-src.tar.bz2) = 1982bb65d0b37e3afee8e6508c2fcef7a4a6f19e3ece40d94499ba681ea44c9b +SIZE (openoffice/apache-openoffice-4.1.2-r1705575-src.tar.bz2) = 218997145 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa Added: head/editors/openoffice-devel/files/patch-i114430-41x ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-i114430-41x Thu Oct 8 01:09:38 2015 (r398790) @@ -0,0 +1,73 @@ +--- sal/inc/rtl/math.h.orig 2014-02-25 08:31:58 UTC ++++ sal/inc/rtl/math.h +@@ -396,6 +396,21 @@ double SAL_CALL rtl_math_round(double fV + */ + 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 +--- sal/inc/rtl/math.hxx.orig 2014-02-25 08:31:58 UTC ++++ sal/inc/rtl/math.hxx +@@ -186,6 +186,13 @@ inline double pow10Exp(double fValue, in + 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) +--- sal/rtl/source/math.cxx.orig 2014-02-25 08:31:57 UTC ++++ sal/rtl/source/math.cxx +@@ -1113,6 +1113,19 @@ double SAL_CALL rtl_math_expm1( double f + 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() + { +--- sal/util/sal.map.orig 2014-02-25 08:31:48 UTC ++++ sal/util/sal.map +@@ -629,6 +629,8 @@ UDK_3.12 { # AOO 3.5 + global: + osl_loadAsciiModule; + osl_loadAsciiModuleRelative; ++ ++ rtl_math_powr; + } UDK_3.11; + + PRIVATE_1.0 {