diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-07-26 22:01:27 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-07-26 22:01:27 +0000 |
| commit | e1fe039f63c0aeee7ed1a6d8b676c3f22c2dad39 (patch) | |
| tree | f9f7be0e371d4caf97f432b28ad6814fe77d9077 /editors/openoffice-1.1/files | |
| parent | update to m121 (diff) | |
Update to 1.1.5rc2
Notes
Notes:
svn path=/head/; revision=140189
Diffstat (limited to 'editors/openoffice-1.1/files')
11 files changed, 21 insertions, 228 deletions
diff --git a/editors/openoffice-1.1/files/moz-patch b/editors/openoffice-1.1/files/moz-patch index 818bc154943d..5da4ae43ef25 100644 --- a/editors/openoffice-1.1/files/moz-patch +++ b/editors/openoffice-1.1/files/moz-patch @@ -23,7 +23,7 @@ this functionality is not used at all. --- moz/mozilla-source-1.0.patch.org Tue Feb 10 19:44:34 2004 +++ moz/mozilla-source-1.0.patch Sat Mar 19 12:51:35 2005 -@@ -4471,14 +4471,15 @@ +@@ -4471,14 +4471,16 @@ return NS_OK; } @@ -31,13 +31,14 @@ this functionality is not used at all. +--- misc/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 +++ misc/build/mozilla/.mozconfig Mon Jul 28 15:07:20 2003 -@@ -0,0 +1,8 @@ -+@@ -0,0 +1,9 @@ ++@@ -0,0 +1,10 @@ +ac_add_options --disable-tests +ac_add_options --disable-xprint +ac_add_options --without-system-zlib +ac_add_options --enable-ldap +ac_add_options --disable-debug ++ac_add_options --disable-freetype2 +++ac_add_options --enable-default-toolkit=xlib +ac_add_options --enable-optimize +ac_add_options --enable-crypto +ac_add_options --enable-strip diff --git a/editors/openoffice-1.1/files/patch-config_office+configure.in b/editors/openoffice-1.1/files/patch-config_office+configure.in deleted file mode 100644 index 76cb40db51e6..000000000000 --- a/editors/openoffice-1.1/files/patch-config_office+configure.in +++ /dev/null @@ -1,26 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=40189 - -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.55.6.10 -diff -u -r1.55.6.10 configure.in ---- config_office/configure.in 27 Aug 2004 10:03:41 -0000 1.55.6.10 -+++ config_office/configure.in 18 Dec 2004 03:13:51 -0000 -@@ -357,13 +357,14 @@ - OSVERSION=`/sbin/sysctl -n kern.osreldate` - fi - AC_MSG_RESULT([found OSVERSION=$OSVERSION]) -- PTHREAD_CFLAGS="-D_THREAD_SAFE" - if test "$OSVERSION" -lt "500016"; then -+ PTHREAD_CFLAGS="-D_THREAD_SAFE" - PTHREAD_LIBS="-pthread" - elif test "$OSVERSION" -lt "502102"; then -+ PTHREAD_CFLAGS="-D_THREAD_SAFE" - PTHREAD_LIBS="-lc_r" - else -- PTHREAD_LIBS="-lpthread" -+ PTHREAD_LIBS="-pthread" - fi - ;; - "OSF1") diff --git a/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx deleted file mode 100644 index 6ef5bf464ef9..000000000000 --- a/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=40643 - -Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however, -it is not certified by SUN Microsystems. FreeBSD can use Linux's Java -since there is a binary compatibility (NOT EMULATION!) -Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default, -we need to add several seachpaths. - -Index: jvmaccess/source/javainfoimpl.cxx -=================================================================== -RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v -retrieving revision 1.7.12.5 -diff -u -r1.7.12.5 javainfoimpl.cxx ---- jvmaccess/source/javainfoimpl.cxx 20 Oct 2004 11:43:13 -0000 1.7.12.5 -+++ jvmaccess/source/javainfoimpl.cxx 14 Jan 2005 10:58:53 -0000 -@@ -240,8 +240,16 @@ - "java", \ - "Home", \ - "IBMJava2-" ARCH "-131", \ -- "IBMJava2-" ARCH "-141" -- -+ "IBMJava2-" ARCH "-141" , \ -+ "jdk1.4.2", \ -+ "diablo-jre1.3.1", \ -+ "diablo-jdk1.3.1", \ -+ "linux-sun-jdk1.3.1", \ -+ "linux-sun-jdk1.4.2", \ -+ "linux-ibm-jdk1.3.1", \ -+ "linux-ibm-jdk1.4.2", \ -+ "linux-blackdown-jdk1.3.1", \ -+ "linux-blackdown-jdk1.4.2" - - /* These are directories in which a java installation is - looked for. diff --git a/editors/openoffice-1.1/files/patch-odk+configure.pl b/editors/openoffice-1.1/files/patch-odk+configure.pl index bd269a961590..eba758c6b281 100644 --- a/editors/openoffice-1.1/files/patch-odk+configure.pl +++ b/editors/openoffice-1.1/files/patch-odk+configure.pl @@ -1,4 +1,7 @@ -#IZ Not raised yet. this is very ad hoc patch... +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho <maho@openoffice.org> (JCA) +Description : most pop name of installated GNU make is gmake, not make for FreeBSD Index: configure.pl =================================================================== diff --git a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index 59269742ab37..000000000000 --- a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,28 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=24142 - ---- odk/setsdkenv_unix.in.orig 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-1.1/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk deleted file mode 100644 index 78814a4cfaee..000000000000 --- a/editors/openoffice-1.1/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=24142 - ---- odk/settings/settings.mk.orig 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-1.1/files/patch-scp+source+office+unxbasic.scp b/editors/openoffice-1.1/files/patch-scp+source+office+unxbasic.scp index daba6e99866f..ecb51c46c8d6 100644 --- a/editors/openoffice-1.1/files/patch-scp+source+office+unxbasic.scp +++ b/editors/openoffice-1.1/files/patch-scp+source+office+unxbasic.scp @@ -1,3 +1,8 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho <maho@openoffice.org> (JCA) +Description : Do not make a link as /usr/bin/soffice + Index: scp/source/office/unxbasic.scp =================================================================== RCS file: /cvs/installation/scp/source/office/Attic/unxbasic.scp,v diff --git a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx index 6cf440329e06..360312fc8001 100644 --- a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx @@ -1,3 +1,7 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho <maho@openoffice.org> (JCA) +Description : In solver/645/unxfbsd.pro/inc/rtl/string.hxx, even though there is a descrioptin like static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(()) diff --git a/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx b/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx deleted file mode 100644 index 748c13bdf642..000000000000 --- a/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx +++ /dev/null @@ -1,21 +0,0 @@ -OpenOffice DOC document Heap Overflow -o http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8387 -o http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8417 -http://util.openoffice.org/source/browse/util/sot/source/sdstor/stgole.cxx?r1=1.4&r2=1.4.166.1 - -Index: sot/source/sdstor/stgole.cxx -=================================================================== -RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v -retrieving revision 1.4 -diff -u -r1.4 stgole.cxx ---- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 -+++ sot/source/sdstor/stgole.cxx 18 Apr 2005 01:34:25 -0000 -@@ -156,6 +156,8 @@ - *this >> aClsId; - INT32 nLen1 = 0; - *this >> nLen1; -+ // higher bits are ignored -+ nLen1 &= 0xFFFF; - sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; - if( Read( p, nLen1 ) == (ULONG) nLen1 ) - { diff --git a/editors/openoffice-1.1/files/patch-translation_limit_64k b/editors/openoffice-1.1/files/patch-translation_limit_64k index 109833162541..4eea8acadbb5 100644 --- a/editors/openoffice-1.1/files/patch-translation_limit_64k +++ b/editors/openoffice-1.1/files/patch-translation_limit_64k @@ -1,7 +1,8 @@ -#iZ 33228# -#iZ 34210# -Kannada doesn't build since some resources are limited to 64k. -it won't fix for 1.1.x +Issutracker : #i33228#, #i34210# +CWS : N/A +Author : +Description : Kannada doesn't build since some resources are +limited to 64k. it won't fix for 1.1.x officially Index: inc/sc.hrc =================================================================== diff --git a/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx deleted file mode 100644 index 88225ffe8308..000000000000 --- a/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx +++ /dev/null @@ -1,22 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=40191 - -sys/socket.h is needed for FreeBSD - -Index: ucbhelper/source/client/proxydecider.cxx -=================================================================== -RCS file: /cvs/ucb/ucbhelper/source/client/proxydecider.cxx,v -retrieving revision 1.3.16.1 -diff -u -r1.3.16.1 proxydecider.cxx ---- ucbhelper/source/client/proxydecider.cxx 20 Oct 2004 12:04:36 -0000 1.3.16.1 -+++ ucbhelper/source/client/proxydecider.cxx 30 Dec 2004 04:12:01 -0000 -@@ -127,6 +127,10 @@ - #include <unistd.h> - #endif - -+#if defined (FREEBSD) -+#include <sys/socket.h> -+#endif -+ - #ifdef SOLARIS - - extern "C" |