Index: head/editors/openoffice-devel/Makefile =================================================================== --- head/editors/openoffice-devel/Makefile (revision 385716) +++ head/editors/openoffice-devel/Makefile (revision 385717) @@ -1,395 +1,395 @@ # Created by: Martin Blapp # $FreeBSD$ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} #PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= editors java MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ LOCAL/truckman/openoffice:snap,extsrc .if defined(LANG_PKGNAME) PKGNAMEPREFIX= ${LANG_PKGNAME}- .endif .if defined(LANG_SUFFIX) PKGNAMESUFFIX= -${LANG_SUFFIX} .endif PKGNAMESUFFIX= -devel DISTFILES= ${OOOSRC}${AOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc EXTRACT_ONLY= ${OOOSRC} MAINTAINER= office@FreeBSD.org #de facto maintainer is truckman@FreeBSD.org #Frequent Patch submitters should optionally sign Apache iCLA COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version) LICENSE= APACHE20 BUILD_DEPENDS= \ p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip \ ant:${PORTSDIR}/devel/apache-ant \ dmake:${PORTSDIR}/devel/dmake \ epm:${PORTSDIR}/devel/epm \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ imake:${PORTSDIR}/devel/imake \ gpatch:${PORTSDIR}/devel/patch \ ${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \ ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ bash:${PORTSDIR}/shells/bash \ ${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww LIB_DEPENDS= \ libapr-1.so:${PORTSDIR}/devel/apr1 \ libcurl.so:${PORTSDIR}/ftp/curl \ libcairo.so:${PORTSDIR}/graphics/cairo \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ libgraphite.so:${PORTSDIR}/graphics/silgraphite \ libCoinMP.so:${PORTSDIR}/math/coinmp \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libnss3.so:${PORTSDIR}/security/nss \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libhyphen.so:${PORTSDIR}/textproc/hyphen \ libtextcat.so:${PORTSDIR}/textproc/libtextcat \ libmythes-1.2.so:${PORTSDIR}/textproc/mythes \ librdf.so:${PORTSDIR}/textproc/redland \ libserf-1.so:${PORTSDIR}/www/serf RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf AOOVERSION1= 4 AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m1\(Build:9800\) -SVNREVISION= 1667428 +SVNREVISION= 1677314 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150118.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} .if defined(AOORC) AOOSUFFIX= ${AOOVERSION}-${AOORC} OOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} AOODISTTAG= TARTYPE= bzip2 .else AOOSUFFIX= ${PORTVERSION} OOOSRC= apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX} AOODISTTAG= :snap TARTYPE= xz .endif OOODIR= openoffice${AOOVERSION1} AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} DIST_SUBDIR= openoffice NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 amd64 USE_GL= gl glu USE_GNOME= gtk20 libxslt libidl glib20 USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ USE_PERL5= build USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USES= autoreconf:autoconf bison compiler cpe desktop-file-utils \ gmake perl5 pkgconfig python tar:${TARTYPE} WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA CCACHE OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System MMEDIA_DESC= Multimedia backend for impress CCACHE_DESC= Mimimize compile time of C/C++ programs CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib GNOME_USE= GNOME=gconf2 GNOMEVFS_CONFIGURE_ENABLE= gnome-vfs GNOMEVFS_CONFIGURE_OFF= --enable-gio GNOMEVFS_CONFIGURE_ON= --disable-gio GNOMEVFS_USE= GNOME=gnomevfs2 MMEDIA_CONFIGURE_ENABLE= gstreamer MMEDIA_USE= GSTREAMER=yes .include .include <${FILESDIR}/Makefile.localized> .if ${COMPILER_TYPE} == clang . if ${COMPILER_VERSION} < 35 && ${ARCH} == amd64 BUILD_DEPENDS+= clang35:${PORTSDIR}/lang/clang35 CPP= clang-cpp35 CC= clang35 CXX= clang++35 . endif BUILD_DEPENDS+= ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs CONFIGURE_ARGS+= --with-system-boost CPPFLAGS+= -I${LOCALBASE}/include .else USE_GCC= yes SUBST= "s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH//" .endif .if ${ARCH} == amd64 FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh .else FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif LOCALIZED_LANG?= en-US PACKAGE_PREFIX= Apache_OpenOffice .if ${ARCH} == amd64 PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64 .else PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86 .endif .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CCACHE_PREFIX= ccache OOOCC= ${CCACHE_PREFIX} ${CC} OOOCXX= ${CCACHE_PREFIX} ${CXX} .else OOOCC= ${CC} OOOCXX= ${CXX} .endif CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ PATH=${WRKSRC}/solenv/bin:$$PATH GNU_CONFIGURE= yes WRKSUBDIR= ${WRKDIR}/aoo-${AOOVERSION} WRKSRC?= ${WRKSUBDIR}/main BASH?= ${PREFIX}/bin/bash SUB_FILES= pkg-message SUB_LIST= EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} .if defined(DISABLE_MAKE_JOBS) MAKE_JOBS_NUMBER= 4 .endif CONFIGURE_ARGS+= \ --with-system-apache-commons=yes \ --with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \ --with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \ --with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \ --with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \ --with-system-apr \ --with-system-apr-util \ --with-system-beanshell \ --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ --enable-category-b \ --with-system-cairo --enable-cairo \ --with-system-coinmp \ --with-system-curl \ --enable-crashdump \ --with-system-dicts \ --with-epm=${LOCALBASE}/bin/epm \ --with-system-expat \ --disable-fetch-external \ --without-fonts \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --with-gperf=${LOCALBASE}/bin/gperf \ --with-system-graphite \ --enable-gtk \ --with-system-hunspell \ --with-external-dict-dir=${LOCALBASE}/share/hunspell \ --with-system-hyphen \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ --with-system-jpeg \ --with-junit=${LOCALBASE}/share/java/classes/junit.jar \ --with-system-libtextcat \ --disable-kde \ --disable-kde4 \ --with-system-libxml \ --with-system-libxslt \ --with-system-lucene \ --with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \ --with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \ --with-system-mythes \ --with-external-thes-dir=${LOCALBASE}/share/mythes \ --with-system-nss \ --enable-opengl \ --with-system-openssl \ --with-package-format="archive" \ --with-system-poppler \ --with-system-python \ --with-system-redland \ --with-system-serf \ --with-system-stdlibs \ --enable-symbols=small \ --without-stlport \ --with-vendor="FreeBSD ports system" \ --enable-verbose \ --with-system-vigra \ --enable-wiki-publisher \ --with-system-zlib #OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt #OOOEXTENSIONS+= presenter/presenter-screen.oxt #OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt ICONS= ${WRKSRC}/sysui/desktop/icons .include <${FILESDIR}/Makefile.knobs> pre-everything:: # really tweak, extremely useful when you build all localized language versions # needed after when you build with ALL_LOCALIZED_LANGS. .if defined(TWEAK_L10N) ${RM} -f ${WRKDIR}/.PLIST* ${RM} -f ${WRKDIR}/.install_done.* ${RM} -f ${WRKDIR}/.package_done.* ${RM} -f ${WRKDIR}/.extract_done.* ${RM} -f ${WRKDIR}/.patch_done.* ${RM} -f ${WRKDIR}/.configure_done.* ${RM} -f ${WRKDIR}/.build_done.* ${MKDIR} ${WRKDIR} ${TOUCH} ${EXTRACT_COOKIE} ${TOUCH} ${PATCH_COOKIE} ${TOUCH} ${CONFIGURE_COOKIE} ${TOUCH} ${BUILD_COOKIE} .endif post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ ${RM} -rf ${WRKSRC}/l10n post-patch: .if defined (USE_GCC) ${REINPLACE_CMD} -e ${SUBST} ${WRKSRC}/solenv/gbuild/platform/freebsd.mk ${REINPLACE_CMD} -e ${SUBST} ${WRKSRC}/solenv/inc/unxfbsd.mk .endif .if ${ARCH} == i386 # g++49 -Os sometimes leaves inline class methods undefined # autodoc core dumps when built with with -Os clang 3.6 on i386 if [ ${CXX} = g++49 -o \ ${COMPILER_TYPE} = clang -a ${COMPILER_VERSION} = 36 ]; then \ ${REINPLACE_CMD} -e "s/ := -Os/ := -O0/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \ ${REINPLACE_CMD} -e "s/=-Os /=-O0 /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \ fi .endif pre-configure: ${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip do-build: cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config cd ${WRKSRC} ; ./bootstrap cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" FBSD_LDFLAGS="${LDFLAGS}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}" do-install: cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES ${RM} -Rf ${WRKDIR}/tmp ${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ ${ECHO_CMD} "extracting $$i" ; \ cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} ${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/${AOOUDIR}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD} for prog in crashrep pagein uri-encode javaldx regmerge regview; do \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \ done ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; @${ECHO_MSG} "===> Add wrapper scripts"; ${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ ${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%SVNREVISION%%#${SVNREVISION}#g' \ -e 's#%%OOODIR%%#${OOODIR}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper ${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${STAGEDIR}${PREFIX}/bin/${EXECBASE} ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \ ${XARGS} -n 1 ${ECHO_CMD} @dir >> ${TMPPLIST} for app in base calc draw impress math writer; do \ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \ done ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \ ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop ${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak ${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} ${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for iconfile in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${iconfile} \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \ done ; \ done ${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST} ${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} ${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} .include <${FILESDIR}/Makefile.others> .include Index: head/editors/openoffice-devel/distinfo =================================================================== --- head/editors/openoffice-devel/distinfo (revision 385716) +++ head/editors/openoffice-devel/distinfo (revision 385717) @@ -1,6 +1,6 @@ -SHA256 (openoffice/apache-openoffice-r1667428-src.tar.xz) = 2c481e0f14f3f804b303ae5468991b4b7cdc82ce20660545cfb8cef2f5117c2f -SIZE (openoffice/apache-openoffice-r1667428-src.tar.xz) = 215181884 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = b01b8894469a80667b0551ea6c0abffd3fb9e79c8a304d48091ff57ab53f10b7 -SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = 102513542 +SHA256 (openoffice/apache-openoffice-r1677314-src.tar.xz) = 7db08f046ae1cb87ac5d9788a4507d4bd70df1be73c9044a71182087f9ff231c +SIZE (openoffice/apache-openoffice-r1677314-src.tar.xz) = 215202736 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = b01b8894469a80667b0551ea6c0abffd3fb9e79c8a304d48091ff57ab53f10b7 +SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = 102513542 Index: head/editors/openoffice-devel/files/patch-i114430 =================================================================== --- head/editors/openoffice-devel/files/patch-i114430 (revision 385716) +++ head/editors/openoffice-devel/files/patch-i114430 (nonexistent) @@ -1,112 +0,0 @@ -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 (working copy) -@@ -1611,14 +1611,14 @@ - if (bFlag) - { for ( SCSIZE i = 0; i < nCount; i++ ) - if (pMat->IsValue(i)) -- pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i); -+ pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i); - else - pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); - } - else - { for ( SCSIZE i = 0; i < nCount; i++ ) - if (pMat->IsValue(i)) -- pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i); -+ pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i); - else - pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); - } -@@ -1628,7 +1628,7 @@ - PushIllegalArgument(); - } - else -- PushDouble(pow(fVal1,fVal2)); -+ PushDouble(::rtl::math::powr(fVal1,fVal2)); - } - - void ScInterpreter::ScSumProduct() Property changes on: head/editors/openoffice-devel/files/patch-i114430 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx (nonexistent) @@ -1,34 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig 2014-09-19 17:51:13 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx -@@ -24,6 +24,10 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_bridges.hxx" - -+#include -+#include -+#include -+#include - #include - - #include -@@ -39,6 +43,11 @@ - - using namespace ::rtl; - using namespace ::com::sun::star::uno; -+#ifdef __GLIBCXX__ -+using CPPU_CURRENT_NAMESPACE::__cxa_get_globals; -+#else -+using __cxxabiv1::__cxa_get_globals; -+#endif - - namespace - { -@@ -305,7 +314,7 @@ static void cpp_call( - catch (...) - { - // fill uno exception -- fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); -+ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); - - // temporary params - for ( ; nTempIndizes--; ) Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx (nonexistent) @@ -1,14 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx.orig 2014-09-19 17:51:13 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx -@@ -24,6 +24,11 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_bridges.hxx" - -+#include -+#include -+#include -+#include -+ - #include - #include "com/sun/star/uno/RuntimeException.hpp" - #include Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-set_soenv.in =================================================================== --- head/editors/openoffice-devel/files/patch-set_soenv.in (revision 385716) +++ head/editors/openoffice-devel/files/patch-set_soenv.in (nonexistent) @@ -1,79 +0,0 @@ ---- set_soenv.in.orig 2015-01-17 23:35:07.000000000 -0800 -+++ set_soenv.in 2015-02-23 16:02:44.000000000 -0800 -@@ -359,7 +359,7 @@ - elsif ( $platform =~ m/freebsd/ ) - { $BIG_SVX = "TRUE"; - $COM = "GCC"; -- $COMPATH = '@COMPATH@'; -+ $COMPATH = '@COMPATH@' . '/bin'; - $CVER = "C300"; - $GUI = "UNX"; - $GUIBASE = "unx"; -@@ -2617,26 +2617,37 @@ - my @originalPairs = @_; - my @pairs = @originalPairs; - my @Path = split /$ps/, $oldPath; -+ my @buildPath; -+ my @sysPath; -+ my $elem; -+ -+ for $elem (@Path) { -+ if ($elem eq '.' || $elem =~ m'^$SOLARENV/' || -+ $elem =~ m'/solenv/') { -+ push @buildPath, $elem; -+ } else { -+ push @sysPath, $elem; -+ } -+ } - - while (@pairs) { - my $path = shift @pairs; - my $cmd = shift @pairs; - my $to_append = 1; -- my $elem; - - if (! -x "$path/$cmd") { - AddWarning ("Missing executable $path/$cmd\n"); - } - -- for $elem (@Path) { -+ for $elem (@sysPath) { - if ($elem eq $path) { - # print "Hit duplicate path in path; break\n"; - $to_append = 0; - last; - } -- if (-f "$elem/$cmd") { -+ if (-f "$elem/$cmd" && ! -l "$elem/$cmd") { - # print "Element already in path ...\n"; -- unshift @Path, $path; -+ unshift @sysPath, $path; - $to_append = 0; - last; - } else { -@@ -2644,7 +2655,7 @@ - } - } - if ($to_append) { -- push @Path, $path; -+ push @sysPath, $path; - } - } - -@@ -2654,14 +2665,14 @@ - my $cmd = shift @pairs; - my $realpath; - -- $realpath = PathLookup ($cmd, @Path); -+ $realpath = PathLookup ($cmd, @sysPath); - if (!($realpath eq $path)) { - AddWarning ("Path conflict for executables " . - "$path/$cmd against $realpath"); - } - } - -- return join $ps, CleanupPath (@Path); -+ return join $ps, @buildPath, CleanupPath (@sysPath); - } - - #------------------------------------------------------------ Property changes on: head/editors/openoffice-devel/files/patch-set_soenv.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-unxfbsd.mk =================================================================== --- head/editors/openoffice-devel/files/patch-unxfbsd.mk (revision 385716) +++ head/editors/openoffice-devel/files/patch-unxfbsd.mk (nonexistent) @@ -1,54 +0,0 @@ ---- solenv/inc/unxfbsd.mk.orig 2014-09-19 18:16:56 UTC -+++ solenv/inc/unxfbsd.mk -@@ -27,7 +27,7 @@ ASM= - AFLAGS= - - SOLAR_JAVA*= --PICSWITCH*:=-fpic -+PICSWITCH*:=-fPIC - JAVAFLAGSDEBUG=-g - - # Include arch specific makefile. -@@ -49,7 +49,7 @@ JAVAFLAGSDEBUG=-g - #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - - # _PTHREADS is needed for the stl --CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_STL_INCLUDE_PATH - - # enable visibility define in "sal/types.h" - .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -@@ -88,7 +88,7 @@ CFLAGSENABLESYMBOLS=-g # was temporarily - # flags for the C++ Compiler - CFLAGSCC= -pipe $(ARCH_FLAGS) - # Flags for enabling exception handling --CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -+CFLAGSEXCEPTIONS=-fexceptions - # Flags for disabling exception handling - CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -@@ -156,7 +156,7 @@ LINKFLAGSRUNPATH_OXT= - LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' - #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' - LINKFLAGSRUNPATH_NONE= --LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) -+LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) - - # linker flags for linking applications - LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ -@@ -199,11 +199,11 @@ STDSHLCUIMT+=-ltcmalloc - .ENDIF - - # libraries for linking applications --STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed --STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed -+STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} -+STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} - # libraries for linking shared libraries --STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed --STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed -+STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} -+STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} - - X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed - Property changes on: head/editors/openoffice-devel/files/patch-unxfbsd.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx (nonexistent) @@ -1,39 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig 2014-09-19 17:51:13 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx -@@ -24,9 +24,9 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_bridges.hxx" - --#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) -+#include - #include --#endif -+#include - - #include - #include -@@ -182,7 +182,12 @@ type_info * RTTI::getRTTI( typelib_Compo - char const * rttiName = symName.getStr() +4; - #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr,"generated rtti for %s\n", rttiName ); -+#ifndef __GLIBCXX__ /* #i124421# */ -+ const OString aCUnoName = OUStringToOString( unoName, RTL_TEXTENCODING_UTF8); -+ OSL_TRACE( "TypeInfo for \"%s\" not found and cannot be generated.\n", aCUnoName.getStr()); -+#endif /* __GLIBCXX__ */ - #endif -+#ifdef __GLIBCXX__ /* #i124421# */ - if (pTypeDescr->pBaseTypeDescription) - { - // ensure availability of base -@@ -196,7 +201,10 @@ type_info * RTTI::getRTTI( typelib_Compo - // this class has no base class - rtti = new __class_type_info( strdup( rttiName ) ); - } -- -+#else /* __GLIBCXX__ */ -+ rtti = NULL; -+#endif /* __GLIBCXX__ */ -+ - pair< t_rtti_map::iterator, bool > insertion( - m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); - OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" ); Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx (nonexistent) @@ -1,37 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig 2014-09-19 17:51:13 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx -@@ -24,9 +24,9 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_bridges.hxx" - --#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) -+#include - #include --#endif -+#include - - #include - #include -@@ -182,7 +182,12 @@ type_info * RTTI::getRTTI( typelib_Compo - char const * rttiName = symName.getStr() +4; - #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr,"generated rtti for %s\n", rttiName ); -+#ifndef __GLIBCXX__ /* #i124421# */ -+ const OString aCUnoName = OUStringToOString( unoName, RTL_TEXTENCODING_UTF8); -+ OSL_TRACE( "TypeInfo for \"%s\" not found and cannot be generated.\n", aCUnoName.getStr()); -+#endif /* __GLIBCXX__ */ - #endif -+#ifdef __GLIBCXX__ /* #i124421# */ - if (pTypeDescr->pBaseTypeDescription) - { - // ensure availability of base -@@ -196,6 +201,9 @@ type_info * RTTI::getRTTI( typelib_Compo - // this class has no base class - rtti = new __class_type_info( strdup( rttiName ) ); - } -+#else /* __GLIBCXX__ */ -+ rtti = NULL; -+#endif /* __GLIBCXX__ */ - - pair< t_rtti_map::iterator, bool > insertion( - m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-freebsd.mk =================================================================== --- head/editors/openoffice-devel/files/patch-freebsd.mk (revision 385716) +++ head/editors/openoffice-devel/files/patch-freebsd.mk (nonexistent) @@ -1,26 +0,0 @@ ---- solenv/gbuild/platform/freebsd.mk.orig 2014-09-19 18:16:41 UTC -+++ solenv/gbuild/platform/freebsd.mk -@@ -96,6 +96,7 @@ gb_CXXFLAGS := \ - -fvisibility-inlines-hidden \ - -fvisibility=hidden \ - -pipe \ -+ -DHAVE_STL_INCLUDE_PATH \ - - ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) - gb_CFLAGS_WERROR := -Werror -@@ -110,7 +111,6 @@ endif - gb_LinkTarget_EXCEPTIONFLAGS := \ - -DEXCEPTIONS_ON \ - -fexceptions \ -- -fno-enforce-eh-specs \ - - gb_LinkTarget_NOEXCEPTIONFLAGS := \ - -DEXCEPTIONS_OFF \ -@@ -121,6 +121,7 @@ gb_LinkTarget_LDFLAGS += \ - -Wl,-z,combreloc \ - -Wl,-z,defs \ - $(subst -L../lib , ,$(SOLARLIB)) \ -+ ${FBSD_LDFLAGS} \ - \ - - ifeq ($(HAVE_LD_HASH_STYLE),TRUE) Property changes on: head/editors/openoffice-devel/files/patch-freebsd.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx (nonexistent) @@ -1,54 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig 2014-09-19 17:51:12 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx -@@ -23,10 +23,6 @@ - - #include "uno/mapping.h" - --#include --#include --#include -- - namespace CPPU_CURRENT_NAMESPACE - { - -@@ -34,6 +30,7 @@ void dummy_can_throw_anything( char cons - - // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h - -+#ifdef __GLIBCXX__ - struct _Unwind_Exception - { - unsigned exception_class __attribute__((__mode__(__DI__))); -@@ -62,18 +59,21 @@ struct __cxa_exception - - _Unwind_Exception unwindHeader; - }; -+#endif /* __GLIBCXX__ */ - - extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); - extern "C" void __cxa_throw ( - void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); - -+#ifdef __GLIBCXX__ - struct __cxa_eh_globals - { - __cxa_exception *caughtExceptions; - unsigned int uncaughtExceptions; - }; - extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -+#endif /* __GLIBCXX__ */ - - // ----- - -@@ -81,6 +81,10 @@ extern "C" __cxa_eh_globals *__cxa_get_g - void raiseException( - uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); - //================================================================================================== -+#ifndef __GLIBCXX__ -+using __cxxabiv1:: __cxa_exception; -+#endif /* __GLIBCXX__ */ -+ - void fillUnoException( - __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); - } Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx (nonexistent) @@ -1,54 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2014-09-19 17:51:12 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx -@@ -23,10 +23,6 @@ - - #include "uno/mapping.h" - --#include --#include --#include -- - namespace CPPU_CURRENT_NAMESPACE - { - -@@ -34,6 +30,7 @@ void dummy_can_throw_anything( char cons - - // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h - -+#ifdef __GLIBCXX__ - struct _Unwind_Exception - { - unsigned exception_class __attribute__((__mode__(__DI__))); -@@ -62,18 +59,21 @@ struct __cxa_exception - - _Unwind_Exception unwindHeader; - }; -+#endif /* __GLIBCXX__ */ - - extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); - extern "C" void __cxa_throw ( - void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); - -+#ifdef __GLIBCXX__ - struct __cxa_eh_globals - { - __cxa_exception *caughtExceptions; - unsigned int uncaughtExceptions; - }; - extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -+#endif /* __GLIBCXX__ */ - - // ----- - -@@ -81,6 +81,10 @@ extern "C" __cxa_eh_globals *__cxa_get_g - void raiseException( - uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); - //================================================================================================== -+#ifndef __GLIBCXX__ -+using __cxxabiv1:: __cxa_exception; -+#endif /* __GLIBCXX__ */ -+ - void fillUnoException( - __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); - } Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-sal =================================================================== --- head/editors/openoffice-devel/files/patch-sal (revision 385716) +++ head/editors/openoffice-devel/files/patch-sal (nonexistent) @@ -1,13 +0,0 @@ ---- sal/inc/rtl/string.hxx 2014-01-24 03:32:49.000000000 +0900 -+++ sal/inc/rtl/string.hxx 2014-02-04 14:57:30.000000000 +0900 -@@ -234,8 +234,9 @@ - @return a pointer to a (not necessarily null-terminated) byte string - representing the characters of this string object. - */ -- operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; } -+ - public: -+ operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; } - /** Returns a reference to a character of this string. */ - sal_Char& operator[]( int n ) { return pData->buffer[n]; } - /** Returns a const reference to a character of this string. */ Property changes on: head/editors/openoffice-devel/files/patch-sal ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx =================================================================== --- head/editors/openoffice-devel/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx (nonexistent) @@ -1,10 +0,0 @@ ---- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig 2014-09-19 18:15:07 UTC -+++ shell/source/unix/sysshell/recently_used_file_handler.cxx -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - namespace /* private */ { - //######################################## Property changes on: head/editors/openoffice-devel/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx (nonexistent) @@ -1,36 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig 2014-09-19 17:51:13 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx -@@ -24,9 +24,10 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_bridges.hxx" - --#include - #include --#include -+#include -+#include -+#include - #include - #include - -@@ -47,6 +48,11 @@ - - using namespace ::rtl; - using namespace ::com::sun::star::uno; -+#ifdef __GLIBCXX__ -+using CPPU_CURRENT_NAMESPACE::__cxa_get_globals; -+#else -+using __cxxabiv1::__cxa_get_globals; -+#endif - - //================================================================================================== - static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, -@@ -446,7 +452,7 @@ static void cpp_call( - catch (...) - { - // fill uno exception -- fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); -+ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); - - // temporary params - for ( ; nTempIndizes--; ) Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx =================================================================== --- head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx (revision 385716) +++ head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx (nonexistent) @@ -1,16 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx.orig 2014-09-19 17:51:12 UTC -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx -@@ -24,9 +24,10 @@ - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_bridges.hxx" - --#include --#include --#include -+#include -+#include -+#include -+#include - - #include - #include Property changes on: head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property