svn commit: r325370 - in head/editors/openoffice-4: . files
Maho Nakata
maho at FreeBSD.org
Mon Aug 26 04:19:19 UTC 2013
Author: maho
Date: Mon Aug 26 04:19:17 2013
New Revision: 325370
URL: http://svnweb.freebsd.org/changeset/ports/325370
Log:
Update (branching) Apache OpenOffice port to 4.0.0.
Added:
head/editors/openoffice-4/
- copied from r325368, head/editors/openoffice-3/
head/editors/openoffice-4/files/patch-configmgr (contents, props changed)
head/editors/openoffice-4/files/patch-i114430 (contents, props changed)
head/editors/openoffice-4/files/patch-i123018 (contents, props changed)
head/editors/openoffice-4/files/patch-sal-inline (contents, props changed)
Deleted:
head/editors/openoffice-4/files/patch-bridges
head/editors/openoffice-4/files/patch-configure
head/editors/openoffice-4/files/patch-gperf
head/editors/openoffice-4/files/patch-graphite
head/editors/openoffice-4/files/patch-jdk7-hsqldb-debian
head/editors/openoffice-4/files/patch-jdk7-hsqldb-debian-x
head/editors/openoffice-4/files/patch-jdk7-httpclient-apache-pfg
head/editors/openoffice-4/files/patch-jdk7-httpclient-r1358967
head/editors/openoffice-4/files/patch-jdk7-httpclient-r1359681
head/editors/openoffice-4/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx
head/editors/openoffice-4/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx
head/editors/openoffice-4/files/patch-moz
head/editors/openoffice-4/files/patch-vcl
Modified:
head/editors/openoffice-4/Makefile
head/editors/openoffice-4/distinfo
head/editors/openoffice-4/files/patch-freebsd.mk
head/editors/openoffice-4/files/patch-unxfbsd.mk
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-3/Makefile Sun Aug 25 22:38:47 2013 (r325368)
+++ head/editors/openoffice-4/Makefile Mon Aug 26 04:19:17 2013 (r325370)
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= apache-openoffice
-PORTVERSION= 3.4.1
-PORTREVISION= 2
+PORTVERSION= 4.0.0
CATEGORIES= editors java
-MASTER_SITES= ftp://ftp.riken.jp/net/apache/incubator/ooo/3.4.1/source/ \
+MASTER_SITES= ftp://ftp.riken.jp/net/apache/openoffice/${PORTVERSION}/source/ \
${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc
DISTFILES+= ${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
EXTRACT_ONLY= ${OOOSRC} ${EXTSRC}
@@ -24,13 +23,15 @@ USE_XORG= x11 ice xaw xau xext xrender x
xi xt xcursor xdamage xcomposite xfixes
USE_GL= gl glu
USE_GSTREAMER= yes
-#USE_GCC= yes
+#USE_GCC= 4.6+
USE_GMAKE= yes
USE_PYTHON= yes
-USE_PERL5= build
+USE_PERL5_BUILD= yes
USE_BZIP2= yes
USES+= bison perl5
+USE_PERL5= build
WITHOUT_CPU_CFLAGS= true
+MAKE_JOBS_SAFE= yes
OPTIONS_DEFINE= GCONF GNOMEVFS
OPTIONS_DEFAULT=GCONF GNOMEVFS
@@ -65,16 +66,16 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh
FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
.endif
-OOOSRC= aoo-${PORTVERSION}-incubating-src${EXTRACT_SUFX}
+OOOSRC= apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
EXTSRC= ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
-OOODIR= openoffice.org3
-SVNREVISION= 1372282
+OOODIR= openoffice4
+SVNREVISION= 1503704
INSTALLATION_BASEDIR?= openoffice-${PORTVERSION}
EXECBASE?= openoffice-${PORTVERSION}
DIST_SUBDIR= openoffice
SIMPLEOSVER= ${OSREL:C/\.//g}
-PACKAGE_PREFIX= Apache_OpenOffice_incubating
+PACKAGE_PREFIX= Apache_OpenOffice
.if ${ARCH} == amd64
PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64
.else
@@ -108,18 +109,20 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOO
PATH=${WRKSRC}/solenv/bin:$$PATH \
CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
- expat.6:${PORTSDIR}/textproc/expat2 \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
+ expat:${PORTSDIR}/textproc/expat2 \
+ jpeg:${PORTSDIR}/graphics/jpeg \
curl:${PORTSDIR}/ftp/curl \
- hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
- poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
- rdf.0:${PORTSDIR}/textproc/redland \
- textcat.0:${PORTSDIR}/textproc/libtextcat \
- freetype.9:${PORTSDIR}/print/freetype2 \
- apr-1.4:${PORTSDIR}/devel/apr1 \
- CoinMP.8:${PORTSDIR}/math/coinmp \
- serf-1.0:${PORTSDIR}/www/serf
+ hunspell-1.3:${PORTSDIR}/textproc/hunspell \
+ poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+ rdf:${PORTSDIR}/textproc/redland \
+ textcat:${PORTSDIR}/textproc/libtextcat \
+ freetype:${PORTSDIR}/print/freetype2 \
+ apr-1:${PORTSDIR}/devel/apr1 \
+ CoinMP:${PORTSDIR}/math/coinmp \
+ serf-1:${PORTSDIR}/www/serf \
+ freetype:${PORTSDIR}/print/freetype2 \
+ textcat:${PORTSDIR}/textproc/libtextcat
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
@@ -134,6 +137,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archiver
${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
+ ${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
epm:${PORTSDIR}/devel/epm \
@@ -172,36 +176,41 @@ CONFIGURE_ARGS+= --enable-verbose \
--with-system-poppler \
--with-system-redland \
--with-system-libtextcat \
- --with-system-libtextcat-data=${LOCALBASE}/share/libtextcat \
--with-system-vigra \
--with-system-stdlibs \
--with-system-apr \
--with-system-apr-util \
--with-system-coinmp \
+ --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-lucene \
+ --with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
+ --with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
--with-package-format="archive" \
--enable-gstreamer \
- --enable-minimizer \
- --enable-presenter-console \
--enable-wiki-publisher \
--enable-dbus \
--enable-opengl \
--enable-category-b \
+ --enable-lockdown \
--with-system-hunspell \
--with-system-saxon \
--with-saxon-jar=${JAVALIBDIR}/saxon9.jar \
--with-system-beanshell \
--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
- --without-fonts
+ --without-fonts \
+ --with-system-serf
# --with-system-jpeg
-# --with-system-serf \
+# --enable-pdfimport
+# --without-stlport --disable-mozilla \
+# --with-system-graphite \
-OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
-OOOEXTENSIONS+= presenter/presenter-screen.oxt
+#OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
+#OOOEXTENSIONS+= presenter/presenter-screen.oxt
#OOOEXTENSIONS+= pdfimport/pdfimport.oxt
OOOEXTENSIONS+= swext/wiki-publisher.oxt
@@ -229,13 +238,16 @@ pre-everything::
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
+# @${MKDIR} ${WRKSRC}/../ext_sources
+# @${MV} ${WRKDIR}/ooo/ext_sources/* ${WRKSRC}/../ext_sources/
+# @${RM} -rf ${WRKSRC}/l10n
@${MKDIR} ${WRKSRC}/../ext_sources
@${RM} -rf ${WRKSRC}/l10n
post-patch:
.if defined (USE_GCC)
- @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
- @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+ @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
+ @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
.else
@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
@@ -252,19 +264,19 @@ do-build:
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${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/OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
+ @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/OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
+ cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
done
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
- @${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
- @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org\/3/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
+ @${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
+ @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
- @cd ${WRKSRC}/solver/3??/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+ @cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
post-install:
@${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
Modified: head/editors/openoffice-4/distinfo
==============================================================================
--- head/editors/openoffice-3/distinfo Sun Aug 25 22:38:47 2013 (r325368)
+++ head/editors/openoffice-4/distinfo Mon Aug 26 04:19:17 2013 (r325370)
@@ -1,6 +1,6 @@
-SHA256 (openoffice/aoo-3.4.1-incubating-src.tar.bz2) = 56ac24cb4c59e013e623b386d5dfc3c0c61d3352f15e5dce6cb3d3105209835a
-SIZE (openoffice/aoo-3.4.1-incubating-src.tar.bz2) = 252312783
+SHA256 (openoffice/apache-openoffice-4.0.0-r1503704-src.tar.bz2) = 019a7c213f7020afa23bfee555c9d70a1df92fa6e759d20f7e6fa31e01b0aec8
+SIZE (openoffice/apache-openoffice-4.0.0-r1503704-src.tar.bz2) = 211869164
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.3.4.1.r1372282.tar.bz2) = 1334f853e66a74ef13919898658063750deb3ccfcb23d4888112b33e38874fc3
-SIZE (openoffice/ApacheOpenOffice.ext_sources.3.4.1.r1372282.tar.bz2) = 216072913
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704.tar.bz2) = 4d21329da736fbdaaf530d705f7872eb2c6c96180ac917db7f66d7cfc1551e06
+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704.tar.bz2) = 138567395
Added: head/editors/openoffice-4/files/patch-configmgr
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-configmgr Mon Aug 26 04:19:17 2013 (r325370)
@@ -0,0 +1,19 @@
+--- configmgr/source/partial.hxx
++++ configmgr/source/partial.hxx
+@@ -26,6 +26,7 @@
+
+ #include "sal/config.h"
+
++#include <boost/functional/hash.hpp>
+ #include <boost/unordered_map.hpp> // using the boost container because it explicitly allows recursive types
+ #include <set>
+
+@@ -50,7 +51,7 @@ public:
+
+ private:
+ struct Node {
+- typedef boost::unordered_map< rtl::OUString, Node > Children;
++ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
+
+ Node(): startInclude(false) {}
+ void clear() { startInclude=false; children.clear(); }
Modified: head/editors/openoffice-4/files/patch-freebsd.mk
==============================================================================
--- head/editors/openoffice-3/files/patch-freebsd.mk Sun Aug 25 22:38:47 2013 (r325368)
+++ head/editors/openoffice-4/files/patch-freebsd.mk Mon Aug 26 04:19:17 2013 (r325370)
@@ -1,19 +1,10 @@
---- solenv/gbuild/platform/freebsd.mk~ 2011-12-24 18:45:27.000000000 +0900
-+++ solenv/gbuild/platform/freebsd.mk 2011-12-25 11:01:37.000000000 +0900
-@@ -120,6 +120,7 @@
+--- solenv/gbuild/platform/freebsd.mk 2012-10-31 10:39:44.000000000 +0900
++++ solenv/gbuild/platform/freebsd.mk 2012-10-31 17:40:48.000000000 +0900
+@@ -121,6 +121,7 @@
-Wl,-z,combreloc \
-Wl,-z,defs \
$(subst -L../lib , ,$(SOLARLIB)) \
+ %%RPATH%% \
+ \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
- gb_LinkTarget_LDFLAGS += \
-@@ -302,7 +302,7 @@
- $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
-
- define gb_Library_get_rpath
--'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
-+-Wl,-z,origin '-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
- '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
- endef
-
Added: head/editors/openoffice-4/files/patch-i114430
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-i114430 Mon Aug 26 04:19:17 2013 (r325370)
@@ -0,0 +1,112 @@
+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()
Added: head/editors/openoffice-4/files/patch-i123018
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-i123018 Mon Aug 26 04:19:17 2013 (r325370)
@@ -0,0 +1,11 @@
+--- offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl 2013/08/12 08:53:46 1513085
++++ offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl 2013/08/12 09:41:11 1513086
+@@ -122,7 +122,7 @@
+ <p>The change in the data model will be notified to registered listeners via
+ <member">XGridDataListener::dataChanged</member>. The <member>GridDataEvent::FirstColumn</member> and
+ <member>GridDataEvent::LastColumn</member> will denote the smallest respectively largest column
+- index from <argColumnIndexes</arg>.</p>
++ index from <arg>ColumnIndexes</arg>.</p>
+
+ @param ColumnIndexes
+ contains the column indexes of the cells, which should be updated
Added: head/editors/openoffice-4/files/patch-sal-inline
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-sal-inline Mon Aug 26 04:19:17 2013 (r325370)
@@ -0,0 +1,16 @@
+Index: sal/util/makefile.mk
+===================================================================
+--- sal/util/makefile.mk (revision 1509387)
++++ sal/util/makefile.mk (working copy)
+@@ -45,6 +45,11 @@
+ CFLAGS+= $(LFS_CFLAGS)
+ CXXFLAGS+= $(LFS_CFLAGS)
+
++# gcc can have some broken inlining optimizations
++.IF "$(OS)"=="FREEBSD" && "$(COM)" == "GCC"
++CFLAGS += -fkeep-inline-functions
++.ENDIF
++
+ .IF "$(depend)" == ""
+
+ # --- Files --------------------------------------------------------
Modified: head/editors/openoffice-4/files/patch-unxfbsd.mk
==============================================================================
--- head/editors/openoffice-3/files/patch-unxfbsd.mk Sun Aug 25 22:38:47 2013 (r325368)
+++ head/editors/openoffice-4/files/patch-unxfbsd.mk Mon Aug 26 04:19:17 2013 (r325370)
@@ -1,10 +1,10 @@
---- solenv/inc/unxfbsd.mk.orig 2011-12-21 09:47:20.000000000 +0900
-+++ solenv/inc/unxfbsd.mk 2011-12-25 20:48:29.000000000 +0900
-@@ -84,14 +84,14 @@
+--- solenv/inc/unxfbsd.mk~ 2012-10-31 10:39:44.000000000 +0900
++++ solenv/inc/unxfbsd.mk 2012-10-31 17:42:59.000000000 +0900
+@@ -80,14 +80,14 @@
.ENDIF
# flags for the C++ Compiler
--CFLAGSCC= -pipe $(ARCH_FLAGS)
+-CFLAGSCC= -pipe $(ARCH_FLAGS)
+CFLAGSCC= -pipe $(ARCH_FLAGS) %%RPATH%%
# Flags for enabling exception handling
CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
@@ -12,31 +12,16 @@
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# -fpermissive should be removed as soon as possible
--CFLAGSCXX= -pipe $(ARCH_FLAGS)
+-CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX= -pipe $(ARCH_FLAGS) %%RPATH%%
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
CFLAGSCXX += -fvisibility-inlines-hidden
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-@@ -140,16 +140,16 @@
- LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
- .ENDIF # "$(SYSBASE)"!=""
- LINKFLAGSDEFS*=-Wl,-z,defs
--LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
- #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
--LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
--LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
--LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+@@ -145,7 +145,7 @@
LINKFLAGSRUNPATH_OXT=
--LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
-+LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
+ LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
--LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
+-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
+LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
# linker flags for linking applications
More information about the svn-ports-head
mailing list