diff options
author | Maho Nakata <maho@FreeBSD.org> | 2007-12-15 10:11:14 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2007-12-15 10:11:14 +0000 |
commit | c53a61862026f8fc2386290bb1f05c5bb13aea83 (patch) | |
tree | c3d92588e0642ed4f7ad6460396a75531ae67e5c /editors/openoffice.org-vcltesttool/files | |
parent | - Update to 1.4 (diff) |
Update to SRC680_m239.
Notes
Notes:
svn path=/head/; revision=203717
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
4 files changed, 69 insertions, 15 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs index a4d76e99c1aa..a24d1fdea61f 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs @@ -4,9 +4,7 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant" -.if defined(WITH_VBA) -CONFIGURE_ARGS+= --enable-vba --with-vba-package-format="builtin" -.endif +CONFIGURE_ARGS+= --with-vba-package-format="builtin" .if defined(WITH_KDE) CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}" @@ -92,11 +90,6 @@ pre-fetch: @${ECHO} "You can compile OOo without gnome VFS support with" @${ECHO} "make -DWITHOUT_GNOMEVFS" .endif -.if !defined(WITH_VBA) - @${ECHO} - @${ECHO} "You can compile OOo with VBA support with" - @${ECHO} "make -DWITH_VBA" -.endif .if !defined(WITH_SYSTEM_FREETYPE) @${ECHO} @${ECHO} "You can compile OOo with freetype2 from ports with" diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65514 b/editors/openoffice.org-vcltesttool/files/patch-i65514 index cc8221264c59..3a7cabaad912 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i65514 +++ b/editors/openoffice.org-vcltesttool/files/patch-i65514 @@ -1,12 +1,13 @@ --- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40 +++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000 -@@ -107,6 +107,9 @@ - .IF "$(SOLAR_JAVA)"!="" - CONFIGURE_FLAGS+=--enable-java - .ENDIF +@@ -105,6 +105,10 @@ + ..$/dist$/configure + CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 + +.IF "$(COM)$(CPU)"=="GCCX" +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly +.ENDIF - - BUILD_DIR=$(CONFIGURE_DIR) - BUILD_DIR_OUT=$(CONFIGURE_DIR) ++ + # just pass ARCH_FLAGS to native build + CFLAGS+:=$(ARCH_FLAGS) + CXXFLAGS+:=$(ARCH_FLAGS) diff --git a/editors/openoffice.org-vcltesttool/files/patch-i84549 b/editors/openoffice.org-vcltesttool/files/patch-i84549 new file mode 100644 index 000000000000..3f1808c45b5a --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i84549 @@ -0,0 +1,17 @@ +? neon/unxfbsdi.pro +Index: neon/neon.patch +=================================================================== +RCS file: /cvs/external/neon/neon.patch,v +retrieving revision 1.20 +diff -u -r1.20 neon.patch +--- neon/neon.patch 14 Nov 2007 09:49:43 -0000 1.20 ++++ neon/neon.patch 13 Dec 2007 17:16:29 -0000 +@@ -268,7 +268,7 @@ + ! #define HAVE_SYS_TYPES_H 1 + ! + ! /* Define if the timezone global is available */ +-! #ifndef MACOSX ++! #if !defined (MACOSX) && !defined (FREEBSD) + ! #define HAVE_TIMEZONE 1 + ! #endif + ! diff --git a/editors/openoffice.org-vcltesttool/files/patch-i84586 b/editors/openoffice.org-vcltesttool/files/patch-i84586 new file mode 100644 index 000000000000..7b624c3f77f1 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i84586 @@ -0,0 +1,43 @@ +? sc/unxfbsdi.pro +Index: sc/source/ui/vba/vbaaxis.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v +retrieving revision 1.2 +diff -u -r1.2 vbaaxis.cxx +--- sc/source/ui/vba/vbaaxis.cxx 7 Dec 2007 10:43:48 -0000 1.2 ++++ sc/source/ui/vba/vbaaxis.cxx 14 Dec 2007 23:40:31 -0000 +@@ -47,8 +47,8 @@ + + const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") ); + const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); +-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); +-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); ++const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); ++const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); + ScVbaChart* + ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) + { +@@ -142,12 +142,12 @@ + bCrossesAreCustomized = sal_False; + return; + case xlAxisCrossesMinimum: // The axis crosses at the minimum value. +- mxPropertySet->getPropertyValue(MIN) >>= fNum; ++ mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum; + setCrossesAt( fNum ); + bCrossesAreCustomized = sal_False; + break; + case xlAxisCrossesMaximum: // The axis crosses at the maximum value. +- mxPropertySet->getPropertyValue(MAX) >>= fNum; ++ mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum; + setCrossesAt(fNum); + bCrossesAreCustomized = sal_False; + break; +@@ -182,7 +182,7 @@ + mxPropertySet->getPropertyValue(ORIGIN) >>= forigin; + //obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max")); + double fmin = 0.0; +- mxPropertySet->getPropertyValue(MIN) >>= fmin; ++ mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin; + if (forigin == fmin) + nCrosses = xlAxisCrossesMinimum; + else |