Update to 2.0m134

7 files changed, 82 insertions, 51 deletions

diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.others b/editors/openoffice.org-2.0-devel/files/Makefile.others
index 0432f503c88d..e97ee054c437 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.others
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.others
@@ -16,9 +16,9 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
+	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
@@ -30,7 +30,7 @@ ure:
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -53,7 +53,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice.org-2.0-devel/files/fbsd4-workaroundpatch b/editors/openoffice.org-2.0-devel/files/fbsd4-workaroundpatch
index 18134798418a..d69388828582 100644
--- a/editors/openoffice.org-2.0-devel/files/fbsd4-workaroundpatch
+++ b/editors/openoffice.org-2.0-devel/files/fbsd4-workaroundpatch
@@ -40,42 +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
-@@ -72,7 +72,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"
-@@ -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-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in
new file mode 100644
index 000000000000..93e375b46f8e
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/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-devel/files/patch-postprocess+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-postprocess+prj+build.lst
new file mode 100644
index 000000000000..cc04678794e8
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-postprocess+prj+build.lst
@@ -0,0 +1,18 @@
+Issutracker : #i56070#
+CWS         : N/A
+Author:     : <maho@openoffice.org>
+Description : some *.desktop files missing on making installsets
+
+Index: postprocess/prj/build.lst
+===================================================================
+RCS file: /cvs/installation/postprocess/prj/build.lst,v
+retrieving revision 1.20
+diff -u -r1.20 build.lst
+--- postprocess/prj/build.lst	23 Sep 2005 13:55:35 -0000	1.20
++++ postprocess/prj/build.lst	16 Oct 2005 08:36:25 -0000
+@@ -1,4 +1,4 @@
+-po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
++po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
+ po	postprocess			    	usr1	-	all	po_mkout NULL
+ po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
diff --git a/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+makefile.mk
new file mode 100644
index 000000000000..713232e42a70
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/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-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
new file mode 100644
index 000000000000..ff89caae4ff0
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/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)
+ 
diff --git a/editors/openoffice.org-2.0-devel/files/pkg-message.in b/editors/openoffice.org-2.0-devel/files/pkg-message.in
index 0ecb7061e691..016629fb8c3d 100644
--- a/editors/openoffice.org-2.0-devel/files/pkg-message.in
+++ b/editors/openoffice.org-2.0-devel/files/pkg-message.in
@@ -38,13 +38,6 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir.
+".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.