diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-10-04 04:01:00 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-10-04 04:01:00 +0000 |
| commit | 684f0412b8cb3cb611b4716bf90b8633ce1bc8b4 (patch) | |
| tree | 740bb05b0bbe8b8e6fb26d9306ce93cc8d2eb0e9 /editors/openoffice.org-2.0/files | |
| parent | update to 2.0RC1 (diff) | |
Forgot to add patches...
Notes
Notes:
svn path=/head/; revision=144126
Diffstat (limited to 'editors/openoffice.org-2.0/files')
| -rw-r--r-- | editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in | 12 | ||||
| -rw-r--r-- | editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk | 29 |
2 files changed, 41 insertions, 0 deletions
diff --git a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in new file mode 100644 index 000000000000..93e375b46f8e --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in @@ -0,0 +1,12 @@ +--- config_office/set_soenv.in~ Thu Sep 22 23:30:56 2005 ++++ config_office/set_soenv.in Sat Oct 1 12:59:30 2005 +@@ -347,6 +347,9 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; ++ if( @GCCVER@ >= 30401 ) { ++ $CVER = "C341"; ++ } + } + elsif ( $platform =~ m/linux-gnu/ ) + { diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..ff89caae4ff0 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,29 @@ +STLPORT_VERSION is 450 for FreeBSD + +--- solenv/inc/unxfbsdi.mk~ Thu Sep 8 18:52:53 2005 ++++ solenv/inc/unxfbsdi.mk Fri Sep 30 14:08:04 2005 +@@ -45,7 +45,7 @@ + #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + + # _PTHREADS is needed for the stl +-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 ++CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 + + # enable visibility define in "sal/types.h" + .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +--- solenv/inc/unxfbsdi.mk~ Sat Oct 1 08:52:58 2005 ++++ solenv/inc/unxfbsdi.mk Sat Oct 1 12:52:34 2005 +@@ -190,8 +190,13 @@ + + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive + ++.IF "$(USE_STLP_DEBUG)" != "" ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug ++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) ++.ELSE # "$(USE_STLP_DEBUG)" != "" + LIBSTLPORT=$(DYNAMIC) -lstlport_gcc + LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) ++.ENDIF # "$(USE_STLP_DEBUG)" != "" + + #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) + |