diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-10-15 22:13:29 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-10-15 22:13:29 +0000 |
| commit | 922a63e62b2da76a8c5d0ddff0f5c2d7516beb39 (patch) | |
| tree | a384bc6d413fb9fb2e6ada7a750abda2e2c667e4 /editors/openoffice.org-2.0/files | |
| parent | Update MASTER_SITES (unfetchable) (diff) | |
Update to 2.0RC3
Notes
Notes:
svn path=/head/; revision=145479
Diffstat (limited to 'editors/openoffice.org-2.0/files')
3 files changed, 18 insertions, 37 deletions
diff --git a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch index 414bb86c38b4..d69388828582 100644 --- a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch +++ b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch @@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk SHL1STDLIBS= \ $(BFXMLOFFLIB) \ -######################################################################### -Issutracker : #i52984#, #i54178# -CWS : N/A -Author: : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA) -Description : -Workaround for FreeBSD4. For rsc/rscpp, -pthread is ignored although it is -specifled, so specified twice. it does solve the probem. this is redundant -for other FreeBSDs, I believe it is safe. otherwise rsc bombs like: -libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'. - -Index: solenv/inc/unxfbsdi.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v -retrieving revision 1.17 -diff -u -r1.17 unxfbsdi.mk ---- solenv/inc/unxfbsdi.mk 18 Aug 2005 12:04:47 -0000 1.17 -+++ solenv/inc/unxfbsdi.mk 3 Sep 2005 11:10:07 -0000 -@@ -217,8 +217,10 @@ - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread -+# is ignored although it is specifled. This is redundant for other FreeBSDs. -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS) -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) - - #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - diff --git a/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+makefile.mk new file mode 100644 index 000000000000..713232e42a70 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+makefile.mk @@ -0,0 +1,18 @@ +#i54178# + +Index: rsc/source/rscpp/makefile.mk +=================================================================== +RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v +retrieving revision 1.5 +diff -u -r1.5 makefile.mk +--- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5 ++++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000 +@@ -36,6 +36,8 @@ + + TARGETTYPE=CUI + TARGETTHREAD=ST ++# we don't need STL in this project ++NO_DEFAULT_STL=TRUE + + PRJNAME=rsc + TARGET=rscpp diff --git a/editors/openoffice.org-2.0/files/pkg-message.in b/editors/openoffice.org-2.0/files/pkg-message.in index 48be938db95f..575013dd3dd9 100644 --- a/editors/openoffice.org-2.0/files/pkg-message.in +++ b/editors/openoffice.org-2.0/files/pkg-message.in @@ -41,10 +41,3 @@ If you somehow run into problems, please remove the already installed ".openoffice.org2" dir in your homedir. Redo the user installation and the problems should go away. -4. Known issue --------------------------------------------------- -If you invoke English version of OOo setting LANG as C or not -setting LANG environment, -`I18N: Operating system doesn't support locale "en_US"' -in this case you should set LANG as en_US.ISO8859-15 -or en_US.ISO8859-1. |