Opps, backout accidentially removed files...

7 files changed, 239 insertions, 0 deletions

diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..6ef4e95358e8
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
@@ -0,0 +1,46 @@
+#i27028 and #i27028
+http://qa.openoffice.org/issues/show_bug.cgi?id=27021  (Xaw)
+http://qa.openoffice.org/issues/show_bug.cgi?id=27028  (ant)
+
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.63
+diff -u -r1.63 configure.in
+--- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
++++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
+@@ -1478,6 +1478,7 @@
+ elif test "$_os" != "WINNT" ; then
+    AC_PATH_X
+    AC_PATH_XTRA
++   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])])
+ 
+    if test "x$x_includes" = "x"; then
+@@ -1830,10 +1831,12 @@
+ 
+ if test "$enable_java" != "no"; then
+ ANT_HOME=; export ANT_HOME
++WITH_ANT_HOME=; export WITH_ANT_HOME
+ if test -z "$with_ant_home"; then
+    AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat])
+ else
+-   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin)
++   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
++   WITH_ANT_HOME=$with_ant_home
+ fi
+ 
+ 
+@@ -1873,7 +1876,11 @@
+   AC_TRY_EVAL(ant_cmd)
+   if test $? = 0 && test -f ./conftest.class ; then
+     AC_MSG_RESULT([Ant works]) 
+-    ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
++    if test -z "$WITH_ANT_HOME"; then
++       ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
++    else
++       ANT_HOME="$WITH_ANT_HOME"
++    fi
+   else
+     echo "configure: Ant test failed" >&5
+     cat conftest.java >&5
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in
new file mode 100644
index 000000000000..dbb4c3506e1e
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in
@@ -0,0 +1,13 @@
+#i27028
+http://qa.openoffice.org/issues/show_bug.cgi?id=27028
+
+--- ../config_office/set_soenv.in.old	Tue Mar  9 21:31:38 2004
++++ ../config_office/set_soenv.in	Sun Mar 28 09:56:03 2004
+@@ -1419,6 +1419,7 @@
+ ToFile( "XSLTPROC",          "@XSLTPROC@",       "e" );
+ ToFile( "ANT_HOME",          "@ANT_HOME@",       "e" );
+ ToFile( "ANT_LIB",           "@ANT_LIB@",        "e" );
++ToFile( "ANT",               "@ANT@",            "e" );
+ ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
+ ToFile( "STLPORT4",          $STLPORT4,          "e" );
+ ToFile( "ASM_PATH",          $ASM_PATH,          "e" );
diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map
new file mode 100644
index 000000000000..cdb61b141eba
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map
@@ -0,0 +1,13 @@
+Mysterious :)
+
+http://qa.openoffice.org/issues/show_bug.cgi?id=23917
+--- ../cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
++++ ../cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
+@@ -299,6 +299,7 @@
+ _ZNK4cppu6UnoUrl11getProtocolEv;
+ _ZNK4cppu6UnoUrl13getConnectionEv;
+ _ZNK4cppu6UnoUrl13getObjectNameEv;
++_end;
+ 
+ 	local:
+ 		*;
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in
new file mode 100644
index 000000000000..e5551f883231
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in
@@ -0,0 +1,27 @@
+http://qa.openoffice.org/issues/show_bug.cgi?id=24142
+--- ../odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
++++ ../odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
+@@ -2,7 +2,8 @@
+ 
+ # This script starts a new shell and sets all enviroment variables, which
+ # are necessary for building the examples of the Office Development Kit.
+-# The Script was developed for the operating systems Solaris and Linux.
++# The script was developed for the operating systems Solaris, Linux, MacOS X
++# and FreeBSD.
+ 
+ # Installation directory of the Software Development Kit.
+ # Example: OO_SDK_HOME=/work/StarOffice_SDK
+@@ -76,6 +77,13 @@
+     LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH
+     export LD_LIBRARY_PATH
+     ;;
++
++  FreeBSD)
++    directoryname=freebsd
++    exampleout=FREEBSDexample.out
++    LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH
++    export LD_LIBRARY_PATH
++    ;;
+ esac
+ 
+ # Add directory of the SDK tools to the path.
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk
new file mode 100644
index 000000000000..8c3942d12f16
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk
@@ -0,0 +1,90 @@
+http://qa.openoffice.org/issues/show_bug.cgi?id=24142
+
+--- ../odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
++++ ../odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
+@@ -368,3 +368,85 @@
+ 
+ endif
+ 
++ifeq "$(PLATFORM)" "FreeBSD"
++# Settings for FreeBSD using gcc compiler
++
++PROCTYPE := $(shell uname -m)
++
++    
++# Default is freebsd on a intel machine    
++PLATFORM=FreeBSD
++PACKAGE_LIB_DIR=freebsd_x86.plt
++JAVA_PROC_TYPE=i386
++
++OS=FREEBSD
++PS=/
++CC=gcc
++LINK=gcc
++LIB=gcc
++ECHO=@echo
++MKDIR=mkdir -p
++CAT=cat
++OBJ_EXT=o
++SHAREDLIB_EXT=so
++SHAREDLIB_PRE=lib
++SHAREDLIB_OUT=$(OUT_LIB)
++    
++GCC_VERSION=$(shell $(CC) -dumpversion)
++
++ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
++COMID=gcc3
++CPPU_ENV=gcc3
++else
++COMID=GCC
++CPPU_ENV=gcc2
++endif
++
++OSEP=\<
++CSEP=\>
++QUOTE=$(subst S,\,S)
++QM=\"
++    
++DEL=rm -f
++DELRECURSIVE=rm -rf
++COPY=cp
++URLPREFIX=file://
++
++# Include UDK version numbers
++include $(PRJ)/include/udkversion.mk
++
++SALLIB=-lsal
++CPPULIB=-lcppu
++CPPUHELPERLIB=-lcppuhelper$(COMID)
++SALHELPERLIB=-lsalhelper$(COMID)
++STLPORTLIB=-lstlport_gcc
++
++EMPTYSTRING=
++PATH_SEPARATOR=:
++
++# -O is necessary for inlining (see gcc documentation)
++ifeq "$(DEBUG)" "yes"
++CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%%
++else
++CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%%
++endif
++
++SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd
++CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include
++STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl
++CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV)
++
++# define for used compiler necessary for UNO
++#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
++#-DCPPU_ENV=gcc3 -- gcc3 3.0
++
++CC_OUTPUT_SWITCH=-o
++
++LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
++
++EXE_LINK_FLAGS=-Wl
++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%%
++LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)
++
++endif
++
diff --git a/editors/openoffice.org-2-RC/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-2-RC/files/patch-sfx2+source+config+cfgmgr.cxx
new file mode 100644
index 000000000000..be38de290a51
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-sfx2+source+config+cfgmgr.cxx
@@ -0,0 +1,16 @@
+Wired bug?
+http://qa.openoffice.org/issues/show_bug.cgi?id=22253
+
+--- ../sfx2/source/config/cfgmgr.cxx.org	Fri Nov  7 19:11:25 2003
++++ ../sfx2/source/config/cfgmgr.cxx	Fri Nov  7 19:30:26 2003
+@@ -118,6 +118,10 @@
+ 		catch(com::sun::star::ucb::InteractiveAugmentedIOException&)
+ 		{
+ 		}
++		// PJ: This is a workaround for weird error on FreeBSD (#i22253#)
++		catch(com::sun::star::uno::Exception&)
++		{
++		}
+ 		sal_Bool bIsDocument;
+ 		if ( (aAny >>= bIsDocument) && bIsDocument )
+ 			return new SotStorage( TRUE, rName, nMode, STORAGE_TRANSACTED );
diff --git a/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
new file mode 100644
index 000000000000..10c3f3c1f6e8
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
@@ -0,0 +1,34 @@
+http://qa.openoffice.org/issues/show_bug.cgi?id=24315
+
+For FreeBSD, time_t is defined as 
+at /usr/include/machine/_types.h 
+49th typedef int                     __int32_t;
+90th typedef __int32_t       __time_t;               /* time()... */
+and 
+/usr/include/pwd.h:typedef      __time_t        time_t;
+/usr/include/time.h:typedef     __time_t        time_t;
+/usr/include/timeconv.h:typedef __time_t        time_t;
+/usr/include/utime.h:typedef    __time_t        time_t;
+so time_t is equal to 32 bit integer
+
+For LinuxPPC (Yellowdog 3.0.1)
+
+
+--- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
++++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
+@@ -188,9 +188,12 @@
+             write_xml_start_tag(TAG_RECENT_ITEM, file, true);
+             write_xml_tag(TAG_URI, uri_, file);
+             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
+-                                
+-            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
+-            write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
++#if defined FREEBSD
++            rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_);
++#else
++            rtl::OString ts = rtl::OString::valueOf(timestamp_);            
++#endif
++	  write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
+                         
+             if (is_private_)            
+                 write_xml_tag(TAG_PRIVATE, file);