From e05c4de914c57718cc657e8928e5025a82e06b90 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Wed, 10 May 2006 22:06:58 +0000 Subject: Update to SRC680_m168 --- .../openoffice.org-2.0-devel/files/patch-i63069 | 81 ---------------------- .../openoffice.org-2.0-devel/files/patch-i64412 | 16 ----- .../openoffice.org-2.0-devel/files/patch-i64526 | 16 ----- .../openoffice.org-2.0-devel/files/patch-i64906 | 11 +++ 4 files changed, 11 insertions(+), 113 deletions(-) delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-i63069 delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-i64412 delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-i64526 create mode 100644 editors/openoffice.org-2.0-devel/files/patch-i64906 (limited to 'editors/openoffice.org-2.0-devel/files') diff --git a/editors/openoffice.org-2.0-devel/files/patch-i63069 b/editors/openoffice.org-2.0-devel/files/patch-i63069 deleted file mode 100644 index 04b5ee7c717d..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-i63069 +++ /dev/null @@ -1,81 +0,0 @@ -cws freebsd06 -Index: stlport/STLport-4.5.patch -=================================================================== -RCS file: /cvs/external/stlport/STLport-4.5.patch,v -retrieving revision 1.26 -diff -u -r1.26 STLport-4.5.patch ---- stlport/STLport-4.5.patch 7 Mar 2006 17:11:51 -0000 1.26 -+++ stlport/STLport-4.5.patch 11 Mar 2006 05:16:19 -0000 -@@ -120,16 +120,16 @@ - *************** - *** 1 **** - ! dummy ----- 1,59 ---- -+--- 1,69 ---- - ! # - ! # Note : this makefile is for gcc-3 ! - ! # - ! - ! # - ! # compiler --! # --! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT --! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions -+! # take these from the OOo build environment -+! CC*= gcc -+! CXX*= g++ - ! - ! # - ! # Basename for libraries -@@ -141,7 +141,7 @@ - ! # - ! # - ! LINK=ar cr --! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o -+! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o - ! - ! OBJEXT=o - ! DYNEXT=so -@@ -149,26 +149,36 @@ - ! RM=rm -rf - ! PATH_SEP=/ - ! MKDIR=mkdir -p --! COMP=GCC-FREEBSD -+! COMP=GCC$(ARCH) - ! INSTALL_STEP = install_unix - ! - ! all: all_dynamic all_static symbolic_links - ! - ! include common_macros.mak - ! --! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32 -+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized - ! --! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS} -+! CXXFLAGS_COMMON = -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS} -+! CFLAGS_COMMON = -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS} - ! --! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} --! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC -+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC -+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC - ! --! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC - ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC - ! - ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG - ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG - ! -+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC -+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC -+! -+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC -+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC -+! -+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG -+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -+! - ! include common_percent_rules.mak - ! include common_rules.mak - ! diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64412 b/editors/openoffice.org-2.0-devel/files/patch-i64412 deleted file mode 100644 index 8fbac02ef0e0..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-i64412 +++ /dev/null @@ -1,16 +0,0 @@ -cws freebsd06 -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.97 -diff -u -r1.97 set_soenv.in ---- config_office/set_soenv.in 7 Apr 2006 08:02:29 -0000 1.97 -+++ config_office/set_soenv.in 14 Apr 2006 21:35:53 -0000 -@@ -342,6 +342,7 @@ - $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"; -+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; - if( @GCCVER@ >= 30401 ) { - $CVER = "C341"; - } diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64526 b/editors/openoffice.org-2.0-devel/files/patch-i64526 deleted file mode 100644 index 3734fb70a5cf..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-i64526 +++ /dev/null @@ -1,16 +0,0 @@ -Index: sd/source/ui/inc/SdUnoDrawView.hxx -=================================================================== -RCS file: /cvs/graphics/sd/source/ui/inc/SdUnoDrawView.hxx,v -retrieving revision 1.13 -diff -u -r1.13 SdUnoDrawView.hxx ---- sd/source/ui/inc/SdUnoDrawView.hxx 21 Mar 2006 17:25:19 -0000 1.13 -+++ sd/source/ui/inc/SdUnoDrawView.hxx 19 Apr 2006 20:34:07 -0000 -@@ -138,7 +138,7 @@ - DrawViewShell& mrDrawViewShell; - sd::View& mrView; - -- SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw(); -+ SdXImpressDocument* GetModel (void) const throw(); - }; - - } // end of namespace sd diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64906 b/editors/openoffice.org-2.0-devel/files/patch-i64906 new file mode 100644 index 000000000000..fec74c8029ac --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-i64906 @@ -0,0 +1,11 @@ +--- sal/osl/unx/security.c~ Wed May 10 20:57:40 2006 ++++ sal/osl/unx/security.c Wed May 10 22:35:43 2006 +@@ -73,7 +73,7 @@ + static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); + + static oslSecurityImpl * newSecurityImpl(size_t * bufSize) { +-#ifdef MACOSX ++#if defined (MACOSX) || defined (FREEBSD) + /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */ + size_t n = 1024; + #else -- cgit v1.2.3