diff options
Diffstat (limited to 'editors/openoffice-3-devel/files')
130 files changed, 0 insertions, 9079 deletions
diff --git a/editors/openoffice-3-devel/files/debugpatch-setup2::mow::source::loader::loader.c b/editors/openoffice-3-devel/files/debugpatch-setup2::mow::source::loader::loader.c deleted file mode 100644 index 96c651ce22c8..000000000000 --- a/editors/openoffice-3-devel/files/debugpatch-setup2::mow::source::loader::loader.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 -+++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 -@@ -902,6 +902,7 @@ - - void KillSetupDir() - { -+#if 0 - DIR* pDir = opendir( strTmpPath ); - struct dirent* pFile; - -@@ -915,6 +916,10 @@ - - chdir( strInitPath ); - rmdir( strTmpPath ); -+#else -+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", -+ strTmpPath); -+#endif - } - - void makeSymLink( char* s ) diff --git a/editors/openoffice-3-devel/files/debugpatch-solenv::inc::unxfbsdi.mk b/editors/openoffice-3-devel/files/debugpatch-solenv::inc::unxfbsdi.mk deleted file mode 100644 index 52bd2b3d58d6..000000000000 --- a/editors/openoffice-3-devel/files/debugpatch-solenv::inc::unxfbsdi.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 -+++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 -@@ -25,12 +25,12 @@ - .ENDIF - - # flags for C and C++ Compiler --CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include -+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include - CFLAGS+=-I/usr/X11R6/include - - # flags for the C++ Compiler --CFLAGSCC=-pipe --CFLAGSCXX=-pipe -fno-for-scope -fpermissive -+CFLAGSCC=-g -ggdb -pipe -+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive - - # Flags for enabling exception handling - CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-3-devel/files/optpatch-freetype::patch b/editors/openoffice-3-devel/files/optpatch-freetype::patch deleted file mode 100644 index b426a8fb7fcc..000000000000 --- a/editors/openoffice-3-devel/files/optpatch-freetype::patch +++ /dev/null @@ -1,208 +0,0 @@ -Index: files/patch-freetype::patch -=================================================================== -RCS file: files/patch-freetype::patch -diff -N files/patch-freetype::patch ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ files/patch-freetype::patch 4 Aug 2002 15:27:42 -0000 -@@ -0,0 +1,201 @@ -+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch -+--- ../freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002 -++++ ../freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002 -+@@ -1,118 +1,79 @@ -+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 -+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 63,69 **** -+- # ANSI compliance. -+- # -+- ifndef CFLAGS -+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX -+- endif -+- -+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+---- 63,69 ---- -+- # ANSI compliance. -+- # -+- ifndef CFLAGS -+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -+- endif -+- -+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001 -+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 631,637 **** -+- if test "$build_old_libs" = yes; then -+- if test "$pic_mode" != yes; then -+- # Don't build PIC code -+-! command="$base_compile $srcfile" -+- else -+- # All platforms use -DPIC, to notify preprocessed assembler code. -+- command="$base_compile $srcfile $pic_flag -DPIC" -+---- 631,637 ---- -+- if test "$build_old_libs" = yes; then -+- if test "$pic_mode" != yes; then -+- # Don't build PIC code -+-! command="$base_compile $srcfile -DPIC $pic_flag" -+- else -+- # All platforms use -DPIC, to notify preprocessed assembler code. -+- command="$base_compile $srcfile $pic_flag -DPIC" -+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001 -+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 1,7 **** -+---- 1,9 ---- -+- FT_USE_MODULE(autohint_module_class) -+- FT_USE_MODULE(cff_driver_class) -+- FT_USE_MODULE(t1cid_driver_class) -+-+ /* -+- FT_USE_MODULE(pcf_driver_class) -+-+ */ -+- FT_USE_MODULE(psaux_module_class) -+- FT_USE_MODULE(psnames_module_class) -+- FT_USE_MODULE(ft_raster1_renderer_class) -+-*************** -+-*** 9,12 **** -+---- 11,16 ---- -+- FT_USE_MODULE(ft_smooth_renderer_class) -+- FT_USE_MODULE(tt_driver_class) -+- FT_USE_MODULE(t1_driver_class) -+-+ /* -+- FT_USE_MODULE(winfnt_driver_class) -+-+ */ -+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001 -+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 70,76 **** -+---- 70,79 ---- -+- /* All convenience functions are declared as such in their */ -+- /* documentation. */ -+- /* */ -+-+ /* -+- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+-+ */ -+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+- -+- -+- /*************************************************************************/ -+-*************** -+-*** 108,116 **** -+- /* use a vector `plotter' format that isn't supported when this */ -+- /* macro is undefined. */ -+- /* */ -+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -+-- -+- /*************************************************************************/ -+- /* */ -+- /* Glyph Postscript Names handling */ -+---- 111,121 ---- -+- /* use a vector `plotter' format that isn't supported when this */ -+- /* macro is undefined. */ -+- /* */ -+-+ /* -+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+-+ */ -+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -+- /*************************************************************************/ -+- /* */ -+- /* Glyph Postscript Names handling */ -+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002 -+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002 -+-*************** -+-*** 2251,2257 **** -+- ;; -+- -+- irix) -+-! major=`expr $current - $age + 1` -+- verstring="sgi$major.$revision" -+- -+- # Add in all the interfaces that we are compatible with. -+---- 2251,2257 ---- -+- ;; -+- -+- irix) -+-! major=`expr $current - $age` -+- verstring="sgi$major.$revision" -+- -+- # Add in all the interfaces that we are compatible with. -++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk -++--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001 -++@@ -63,7 +63,7 @@ -++ # ANSI compliance. -++ # -++ ifndef CFLAGS -++- CFLAGS := /nologo /c /Ox /G5 /W3 /WX -+++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -++ endif -++ -++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh -++--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001 -+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001 -++@@ -631,7 +631,7 @@ -++ if test "$build_old_libs" = yes; then -++ if test "$pic_mode" != yes; then -++ # Don't build PIC code -++- command="$base_compile $srcfile" -+++ command="$base_compile $srcfile -DPIC $pic_flag" -++ else -++ # All platforms use -DPIC, to notify preprocessed assembler code. -++ command="$base_compile $srcfile $pic_flag -DPIC" -++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h -++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001 -++@@ -1,7 +1,9 @@ -++ FT_USE_MODULE(autohint_module_class) -++ FT_USE_MODULE(cff_driver_class) -++ FT_USE_MODULE(t1cid_driver_class) -+++/* -++ FT_USE_MODULE(pcf_driver_class) -+++*/ -++ FT_USE_MODULE(psaux_module_class) -++ FT_USE_MODULE(psnames_module_class) -++ FT_USE_MODULE(ft_raster1_renderer_class) -++@@ -9,4 +11,6 @@ -++ FT_USE_MODULE(ft_smooth_renderer_class) -++ FT_USE_MODULE(tt_driver_class) -++ FT_USE_MODULE(t1_driver_class) -+++/* -++ FT_USE_MODULE(winfnt_driver_class) -+++*/ -++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h -++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001 -++@@ -70,7 +70,10 @@ -++ /* All convenience functions are declared as such in their */ -++ /* documentation. */ -++ /* */ -+++/* -++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+++*/ -+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -++ -++ -++ /*************************************************************************/ -++@@ -108,8 +111,10 @@ -++ /* use a vector `plotter' format that isn't supported when this */ -++ /* macro is undefined. */ -++ /* */ -+++/* -++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -++- -+++*/ -+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -++ -++ /*************************************************************************/ -++ /* */ -++@@ -338,7 +343,7 @@ -++ /* By undefining this, you will only compile the code necessary to load */ -++ /* TrueType glyphs without hinting. */ -++ /* */ -++-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER -++ -++ -++ /*************************************************************************/ diff --git a/editors/openoffice-3-devel/files/optpatch-vcl::util::makefile.pmk b/editors/openoffice-3-devel/files/optpatch-vcl::util::makefile.pmk deleted file mode 100644 index 41341ff0b4e8..000000000000 --- a/editors/openoffice-3-devel/files/optpatch-vcl::util::makefile.pmk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../vcl/util/makefile.pmk.orig Mon Aug 5 01:39:41 2002 -+++ ../vcl/util/makefile.pmk Mon Aug 5 01:40:03 2002 -@@ -64,7 +64,7 @@ - PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch - PDBTARGET=vcl - --.IF "$(OS)" != "MACOSX" -+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD" - .IF "$(remote)" != "" - USE_BUILTIN_RASTERIZER=true - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-berkeleydb::db-3.2.9.patch b/editors/openoffice-3-devel/files/patch-berkeleydb::db-3.2.9.patch deleted file mode 100644 index 5039502f793d..000000000000 --- a/editors/openoffice-3-devel/files/patch-berkeleydb::db-3.2.9.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Fri Oct 18 22:02:26 2002 -+++ ../berkeleydb/db-3.2.9.patch Fri Oct 18 22:05:40 2002 -@@ -1,3 +1,13 @@ -+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig Fri Oct 18 21:46:44 2002 -++++ build/unxsols3.pro/db-3.2.9/dist/configure Fri Oct 18 21:48:47 2002 -+@@ -1795,6 +1795,7 @@ -+ case "$host_os" in -+ solaris*) JINCSUBDIRS="solaris";; -+ linux*) JINCSUBDIRS="linux genunix";; -++ freebsd*) JINCSUBDIRS="freebsd genunix";; -+ *) JINCSUBDIRS="genunix";; -+ esac -+ - *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 19:28:22 2001 - --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Mon Jun 11 15:50:55 2001 - *************** -@@ -43,3 +53,51 @@ - - CC= @MAKEFILE_CC@ - CCLINK= @MAKEFILE_CCLINK@ -+--- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 -++++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 -+@@ -1194,11 +1194,23 @@ -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -++ # can we support soname and/or expsyms with a.out? -oliva -++ else -+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+- else -++ need_version=no -++ fi -++ ;; -++ -++ freebsd*) -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -+ # can we support soname and/or expsyms with a.out? -oliva -++ else -++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -++ need_version=no -+ fi -+ ;; -+ -+@@ -2019,6 +2031,20 @@ -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -+ soname_spec='${libname}${release}.so$major' -+ dynamic_linker='NetBSD ld.elf_so' -++ fi -++ shlibpath_var=LD_LIBRARY_PATH -++ ;; -++ -++freebsd*) -++ version_type=sunos -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -++ dynamic_linker='FreeBSD (a.out) ld.so' -++ else -++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -++ soname_spec='${libname}${release}.so$major' -++ dynamic_linker='FreeBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; diff --git a/editors/openoffice-3-devel/files/patch-bridges::prj::build.lst b/editors/openoffice-3-devel/files/patch-bridges::prj::build.lst deleted file mode 100644 index 7d2bed72bcaa..000000000000 --- a/editors/openoffice-3-devel/files/patch-bridges::prj::build.lst +++ /dev/null @@ -1,10 +0,0 @@ ---- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001 -+++ ../bridges/prj/build.lst Fri Oct 18 22:13:04 2002 -@@ -13,5 +13,7 @@ - br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL - br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL - br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL - br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL - br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL diff --git a/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel b/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel deleted file mode 100644 index 0f950202dd43..000000000000 --- a/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel +++ /dev/null @@ -1,1719 +0,0 @@ ---- /dev/null Mon Mar 4 21:22:00 2002 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/cpp2uno.cxx Mon Mar 4 21:26:06 2002 -@@ -0,0 +1,614 @@ -+/************************************************************************* -+ * -+ * $RCSfile: cpp2uno.cxx,v $ -+ * -+ * $Revision: 1.8 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#define LEAK_STATIC_DATA -+// #define TRACE(x) OSL_TRACE(x) -+#define TRACE(x) -+ -+#include <malloc.h> -+#if STLPORT_VERSION<321 -+#include <list.h> -+#include <map.h> -+#else -+#include <list> -+#include <map> -+#endif -+#include <typeinfo> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_MUTEX_HXX_ -+#include <osl/mutex.hxx> -+#endif -+ -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace com::sun::star::uno; -+using namespace std; -+using namespace osl; -+using namespace rtl; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, -+ "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+class MediateClassData -+{ -+public: -+ struct ClassDataBuffer -+ { -+ void* m_pVTable; -+ -+ ~ClassDataBuffer(); -+ }; -+private: -+ -+ map< OUString, ClassDataBuffer* > m_aClassData; -+ Mutex m_aMutex; -+ -+ void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* ); -+public: -+ const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* ); -+ -+ MediateClassData() {} -+ ~MediateClassData(); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::ClassDataBuffer::~ClassDataBuffer() -+{ -+ delete m_pVTable; -+} -+ -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() -+{ -+ TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" ); -+ -+ // this MUST be the absolute last one which is called! -+ for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos ) -+ { -+ // todo -+// delete (*iPos).second; -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType ) -+{ -+ MutexGuard aGuard( m_aMutex ); -+ -+ map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName ); -+ if( element != m_aClassData.end() ) -+ return (*element).second; -+ -+ ClassDataBuffer* pBuffer = new ClassDataBuffer(); -+ createVTable( pBuffer, pType ); -+ m_aClassData[ pType->aBase.pTypeName ] = pBuffer; -+ return pBuffer; -+} -+ -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ -+ typelib_TypeClass aType = -+ cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+//__________________________________________________________________________________________________ -+ -+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType ) -+{ -+ // get all member functions -+ list< sal_Bool > aComplexReturn; -+ -+ for( int n = 0; n < pType->nAllMembers; n++ ) -+ { -+ typelib_TypeDescription* pMember = NULL; -+ TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] ); -+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE ) -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef ); -+ // get method -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ // set method -+ if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly ) -+ aComplexReturn.push_back( sal_False ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ else -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef ); -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ TYPELIB_DANGER_RELEASE( pMember ); -+ } -+ -+ int nSize = aComplexReturn.size(); -+ char * pSpace = (char *)rtl_allocateMemory( ((nSize+2)*sizeof(void *)) + (nSize*20) ); -+ pBuffer->m_pVTable = (void*)pSpace; -+ -+ char * pCode = pSpace + ((nSize+2)*sizeof(void *)); -+ void ** pvft = (void **)pSpace; -+ pvft[0] = NULL; -+ pvft[1] = NULL; -+ -+ // setup vft and code -+ for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos ) -+ { -+ unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20); -+ pvft[nPos+2] = codeSnip; -+ -+ // mov $nPos, %eax -+ *codeSnip++ = 0xb8; -+ *(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 ); -+ codeSnip += sizeof(sal_Int32); -+ aComplexReturn.pop_front(); -+ // mov %esp, %edx -+ *codeSnip++ = 0x89; -+ *codeSnip++ = 0xe2; -+ // jmp cpp_vtable_call -+ *codeSnip++ = 0xe9; -+ *(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32); -+ codeSnip += sizeof(sal_Int32); -+ } -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable; -+} -+ -+} -+ -+//################################################################################################## -+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); -+} -+ ---- /dev/null Mon Mar 4 21:22:00 2002 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/except.cxx Mon Mar 4 21:26:08 2002 -@@ -0,0 +1,365 @@ -+/************************************************************************* -+ * -+ * $RCSfile: except.cxx,v $ -+ * -+ * $Revision: 1.11 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/07/23 13:15:32 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+#include <dlfcn.h> -+#include <new.h> -+#include <typeinfo> -+#if STLPORT_VERSION<321 -+#include <map.h> -+#else -+#include <map> -+#endif -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_DIAGNOSE_H_ -+#include <osl/diagnose.h> -+#endif -+ -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ -+#include <com/sun/star/uno/Any.hxx> -+#endif -+ -+#include <rtl/strbuf.hxx> -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+#ifdef DEBUG -+#include <stdio.h> -+#endif -+ -+using namespace std; -+using namespace osl; -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static OString toUNOname( const OString & rRTTIname ) -+{ -+ OString aRet; -+ -+ sal_Char* pStr = rRTTIname.getStr(); -+ sal_Char* pOrg = pStr; -+ -+ // check for namespace -+ if( *pStr == '_' ) -+ pStr++; -+ if( *pStr == 'Q' ) -+ { -+ pStr++; -+ if( *pStr++ == '_' ) -+ { -+ while( *pStr++ != '_' ) -+ ; -+ } -+ } -+ -+ while( *pStr ) -+ { -+ int nCharsToCopy = 0; -+ while( *pStr >= '0' && *pStr <= '9' ) -+ nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0'); -+ if( aRet.getLength() ) -+ aRet += "."; -+ aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy ); -+ pStr += nCharsToCopy; -+ } -+ -+ return aRet; -+} -+//================================================================================================== -+static OString toRTTIname( const OString & rUNOname ) -+{ -+ if( ! rUNOname.getLength() ) -+ return OString(); -+ -+ OStringBuffer aRet( 64 ); -+ -+ sal_Int32 nIndex = 0; -+ sal_Int32 nToken = 0; -+ do -+ { -+ OString aToken( rUNOname.getToken( 0, '.', nIndex ) ); -+ aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) ); -+ aRet.append( aToken ); -+ ++nToken; -+ } -+ while (nIndex >= 0); -+ -+ OString ret( aRet.makeStringAndClear() ); -+ -+ if( nToken >= 2 ) -+ { -+ OStringBuffer buf( 64 ); -+ buf.append( 'Q' ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( OString::valueOf( (sal_Int32)nToken ) ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( ret ); -+ ret = buf.makeStringAndClear(); -+ } -+ -+ return ret; -+} -+ -+ -+//################################################################################################## -+//#### RTTI simulation ############################################################################# -+//################################################################################################## -+ -+class RTTIHolder -+{ -+ static std::map< OString, void* > aAllRTTI; -+public: -+ static void* getRTTI( const OString& rTypename ); -+ static void* getRTTI_UnoName( const OString& rUnoTypename ) -+ { return getRTTI( toRTTIname( rUnoTypename ) ); } -+ -+ static void* insertRTTI( const OString& rTypename ); -+ static void* insertRTTI_UnoName( const OString& rTypename ) -+ { return insertRTTI( toRTTIname( rTypename ) ); } -+ -+ // rSuperTypename MUST exist !!! -+ static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename ); -+ static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename ) -+ { return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); } -+ -+ // for complex RTTI -+ static void* insertRTTI( const OString& rTypename, void* pRTTI ); -+ static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI ) -+ { return insertRTTI( toRTTIname( rTypename ), pRTTI ); } -+}; -+ -+std::map< OString, void* > RTTIHolder::aAllRTTI; -+ -+void* RTTIHolder::getRTTI( const OString& rTypename ) -+{ -+ std::map< OString, void* >::iterator element; -+ -+ element = aAllRTTI.find( rTypename ); -+ return element != aAllRTTI.end() ? (*element).second : NULL; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating base RTTI: %s\n", rTypename.getStr() ); -+#endif -+ void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() ); -+#endif -+ OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" ); -+ void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI ) -+{ -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr ) -+{ -+ OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) ); -+ void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName ); -+ if( pRTTI ) -+ return pRTTI; -+ -+ if( ! pCompTypeDescr->pBaseTypeDescription ) -+ // this is a base type -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName ); -+ if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription ) -+ { -+ OString aBasename( -+ OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) -+ ); -+ if( ! RTTIHolder::getRTTI_UnoName( aBasename ) ) -+ RTTIHolder::insertRTTI_UnoName( aBasename ); -+ -+ // this type has only one supertype -+ return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename ); -+ } -+ -+ // create __si_type_info -+ void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription ); -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+#ifdef DEBUG -+ fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() ); -+#endif -+ pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ), -+ *(__user_type_info*)pSuperRTTI ); -+#if 0 -+ __class_type_info::base_info* pBaseInfo = new __class_type_info::base_info; -+ pBaseInfo->base = (__user_type_info*)pSuperRTTI; -+ pBaseInfo->offset = 0; -+ pBaseInfo->is_virtual = 0; -+ pBaseInfo->access1 = __class_type_info::PUBLIC; -+ -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+ pRTTI = new __class_type_info( -+ strdup( aCompTypeRTTIname.getStr() ), -+ pBaseInfo, -+ 1 -+ ); -+#endif -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI ); -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static Mutex s_aMutex; -+static std::map< void*, typelib_TypeDescription* > aExceptionMap; -+ -+static void deleteException( void* pExc, int nDummy ) -+{ -+ MutexGuard aGuard( s_aMutex ); -+ std::map< void*, typelib_TypeDescription* >::iterator element = -+ aExceptionMap.find( pExc ); -+ OSL_ASSERT( element != aExceptionMap.end() ); -+ if( element != aExceptionMap.end() ) -+ { -+ typelib_TypeDescription* pType = (*element).second; -+ aExceptionMap.erase( pExc ); -+ uno_destructData( pExc, pType, cpp_release ); -+ typelib_typedescription_release( pType ); -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+//################################################################################################## -+//#### exported #################################################################################### -+//################################################################################################## -+ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType ); -+ -+ void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor -+ uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ uno_any_destruct( pUnoExc, 0 ); -+ -+ // a must be -+ OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" ); -+ -+ typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr; -+ void* pRTTI = generateRTTI( pCompTypeDescr ); -+ -+ { -+ MutexGuard aGuard( s_aMutex ); -+ aExceptionMap[ pCppExc ] = pTypeDescr; -+ } -+ -+ __cp_push_exception( pCppExc, pRTTI, deleteException ); -+ __throw(); -+} -+ -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OUString aName( OStringToOUString( -+ toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) ); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ typelib_typedescription_getByName( -+ &pExcTypeDescr, -+ aName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" ); -+ if (pExcTypeDescr) -+ { -+ // construct cpp exception any -+ Any aAny( pInfo->value, pExcTypeDescr ); // const_cast -+ typelib_typedescription_release( pExcTypeDescr ); -+ // construct uno exception any -+ typelib_TypeDescription* pAnyDescr = 0; -+ getCppuType( (const Any *)0 ).getDescription( &pAnyDescr ); -+ uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno ); -+ typelib_typedescription_release( pAnyDescr ); -+ } -+} -+ -+} -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/gcc2_freebsd_intel.hxx Mon Mar 4 21:26:09 2002 -@@ -0,0 +1,153 @@ -+/************************************************************************* -+ * -+ * $RCSfile: gcc2_freebsd_intel.hxx,v $ -+ * -+ * $Revision: 1.1.1.1 $ -+ * -+ * last change: $Author: hr $ $Date: 2000/09/18 15:28:48 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#ifndef _RTL_STRING_HXX_ -+#include <rtl/string.hxx> -+#endif -+#include <typeinfo> -+ -+typedef struct _uno_Any uno_Any; -+typedef struct _uno_Mapping uno_Mapping; -+ -+// private egcs type info structs -+ -+// type_info for a simple class ( no base classes or an enum ) -+struct __user_type_info : public std::type_info { -+ __user_type_info (const char *n) : type_info (n) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+// type_info for a class with one public, nonvirtual base class. -+ -+class __si_type_info : public __user_type_info { -+ const __user_type_info &base; -+ -+public: -+ __si_type_info (const char *n, const __user_type_info &b) -+ : __user_type_info (n), base (b) { } -+ -+ // dynamic cast. built by gcc -+ virtual void *dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+// type_info for a general class. -+ -+typedef unsigned int USItype __attribute__ ((mode (SI))); -+ -+struct __class_type_info : public __user_type_info { -+ enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 }; -+ -+ struct base_info { -+ const __user_type_info *base; -+ USItype offset: 29; -+ bool is_virtual: 1; -+ access access1: 2; -+ }; -+ -+ const base_info *base_list; -+ size_t n_bases; -+ -+ __class_type_info (const char *name, const base_info *bl, size_t bn) -+ : __user_type_info (name), base_list (bl), n_bases (bn) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+struct cp_eh_info -+{ -+ struct __eh_info -+ { -+ void* match_function; -+ short language; -+ short version; -+ }; -+ __eh_info eh_info; -+ void *value; -+ void *type; -+ void (*cleanup)(void *, int); -+ bool caught; -+ cp_eh_info *next; -+ long handlers; -+ void *original_value; -+}; -+ -+extern "C" { -+ void __cp_push_exception( void*, void*, void(*)(void*, int) ); -+ void __throw(); -+} -+ -+//################################################################################################## -+//#### exceptions ################################################################################## -+//################################################################################################## -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno ); -+ -+} -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk Mon Mar 4 21:26:41 2002 -@@ -0,0 +1,109 @@ -+#************************************************************************* -+# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.5 $ -+# -+# last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc2_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2" -+ -+CFLAGSNOOPT=-O0 -+NOOPTFILES=$(SLO)$/uno2cpp.obj -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF= $(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB= i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/uno2cpp.cxx Mon Mar 4 21:26:11 2002 -@@ -0,0 +1,463 @@ -+/************************************************************************* -+ * -+ * $RCSfile: uno2cpp.cxx,v $ -+ * -+ * $Revision: 1.8 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/09/06 11:59:03 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <malloc.h> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+ -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static void callVirtualMethod( void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && -+ (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ __asm__ ( -+ // copy values -+ "pushl %%edx\n\t" -+ "pushl %%ecx\n\t" -+ "pushl %%eax\n\t" -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "mov 0(%%edx), %%ecx\n\t" -+ "sub $4, %%edx\n\t" -+ "push %%ecx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n" -+ "Lcall:\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "add $2, %%eax\n\t" // first two table entries are reserved -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %4\n\t" -+ "mov %%edx, %5\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ "popl %%eax\n\t" -+ "popl %%ecx\n\t" -+ "popl %%edx\n\t" -+ : : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) ); -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__ ( -+ "fstps %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__ ( -+ "fstpl %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch( ... ) -+ { -+ // get exception -+ cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info(); -+ gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ diff --git a/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel-sjlj b/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel-sjlj deleted file mode 100644 index 95874155c7db..000000000000 --- a/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel-sjlj +++ /dev/null @@ -1,1735 +0,0 @@ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx Tue Jun 4 10:49:43 2002 -@@ -0,0 +1,615 @@ -+/************************************************************************* -+ * -+ * $RCSfile: cpp2uno.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#define LEAK_STATIC_DATA -+// #define TRACE(x) OSL_TRACE(x) -+#define TRACE(x) -+ -+#include <stdlib.h> -+#if STLPORT_VERSION<321 -+#include <list.h> -+#include <map.h> -+#else -+#include <list> -+#include <map> -+#endif -+#include <typeinfo> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_MUTEX_HXX_ -+#include <osl/mutex.hxx> -+#endif -+ -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace com::sun::star::uno; -+using namespace std; -+using namespace osl; -+using namespace rtl; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, -+ "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+class MediateClassData -+{ -+public: -+ struct ClassDataBuffer -+ { -+ void* m_pVTable; -+ -+ ~ClassDataBuffer(); -+ }; -+private: -+ -+ map< OUString, ClassDataBuffer* > m_aClassData; -+ Mutex m_aMutex; -+ -+ void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* ); -+public: -+ const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* ); -+ -+ MediateClassData() {} -+ ~MediateClassData(); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::ClassDataBuffer::~ClassDataBuffer() -+{ -+ delete m_pVTable; -+} -+ -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() -+{ -+ TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" ); -+ -+ // this MUST be the absolute last one which is called! -+ for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos ) -+ { -+ // todo -+// delete (*iPos).second; -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType ) -+{ -+ MutexGuard aGuard( m_aMutex ); -+ -+ map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName ); -+ if( element != m_aClassData.end() ) -+ return (*element).second; -+ -+ ClassDataBuffer* pBuffer = new ClassDataBuffer(); -+ createVTable( pBuffer, pType ); -+ m_aClassData[ pType->aBase.pTypeName ] = pBuffer; -+ return pBuffer; -+} -+ -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ -+ typelib_TypeClass aType = -+ cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+//__________________________________________________________________________________________________ -+ -+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType ) -+{ -+ // get all member functions -+ list< sal_Bool > aComplexReturn; -+ -+ for( int n = 0; n < pType->nAllMembers; n++ ) -+ { -+ typelib_TypeDescription* pMember = NULL; -+ TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] ); -+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE ) -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef ); -+ // get method -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ // set method -+ if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly ) -+ aComplexReturn.push_back( sal_False ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ else -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef ); -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ TYPELIB_DANGER_RELEASE( pMember ); -+ } -+ -+ int nSize = aComplexReturn.size(); -+ char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) ); -+ pBuffer->m_pVTable = (void*)pSpace; -+ -+ char * pCode = pSpace + (2*(nSize+1)*sizeof(void *)); -+ void ** pvft = (void **)pSpace; -+ pvft[0] = NULL; -+ pvft[1] = NULL; -+ -+ // setup vft and code -+ for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos ) -+ { -+ unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20); -+ pvft[(nPos << 1) + 2 ] = NULL; -+ pvft[(nPos << 1) + 3 ] = codeSnip; -+ -+ // mov $nPos, %eax -+ *codeSnip++ = 0xb8; -+ *(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 ); -+ codeSnip += sizeof(sal_Int32); -+ aComplexReturn.pop_front(); -+ // mov %esp, %edx -+ *codeSnip++ = 0x89; -+ *codeSnip++ = 0xe2; -+ // jmp cpp_vtable_call -+ *codeSnip++ = 0xe9; -+ *(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32); -+ codeSnip += sizeof(sal_Int32); -+ } -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable; -+} -+ -+} -+ -+//################################################################################################## -+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); -+} -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx Tue Jun 4 10:49:44 2002 -@@ -0,0 +1,365 @@ -+/************************************************************************* -+ * -+ * $RCSfile: except.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+#include <dlfcn.h> -+#include <new.h> -+#include <typeinfo> -+#if STLPORT_VERSION<321 -+#include <map.h> -+#else -+#include <map> -+#endif -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_DIAGNOSE_H_ -+#include <osl/diagnose.h> -+#endif -+ -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ -+#include <com/sun/star/uno/Any.hxx> -+#endif -+ -+#include <rtl/strbuf.hxx> -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+#ifdef DEBUG -+#include <stdio.h> -+#endif -+ -+using namespace std; -+using namespace osl; -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static OString toUNOname( const OString & rRTTIname ) -+{ -+ OString aRet; -+ -+ sal_Char* pStr = rRTTIname.getStr(); -+ sal_Char* pOrg = pStr; -+ -+ // check for namespace -+ if( *pStr == '_' ) -+ pStr++; -+ if( *pStr == 'Q' ) -+ { -+ pStr++; -+ if( *pStr++ == '_' ) -+ { -+ while( *pStr++ != '_' ) -+ ; -+ } -+ } -+ -+ while( *pStr ) -+ { -+ int nCharsToCopy = 0; -+ while( *pStr >= '0' && *pStr <= '9' ) -+ nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0'); -+ if( aRet.getLength() ) -+ aRet += "."; -+ aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy ); -+ pStr += nCharsToCopy; -+ } -+ -+ return aRet; -+} -+//================================================================================================== -+static OString toRTTIname( const OString & rUNOname ) -+{ -+ if( ! rUNOname.getLength() ) -+ return OString(); -+ -+ OStringBuffer aRet( 64 ); -+ -+ sal_Int32 nIndex = 0; -+ sal_Int32 nToken = 0; -+ do -+ { -+ OString aToken( rUNOname.getToken( 0, '.', nIndex ) ); -+ aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) ); -+ aRet.append( aToken ); -+ ++nToken; -+ } -+ while (nIndex >= 0); -+ -+ OString ret( aRet.makeStringAndClear() ); -+ -+ if( nToken >= 2 ) -+ { -+ OStringBuffer buf( 64 ); -+ buf.append( 'Q' ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( OString::valueOf( (sal_Int32)nToken ) ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( ret ); -+ ret = buf.makeStringAndClear(); -+ } -+ -+ return ret; -+} -+ -+ -+//################################################################################################## -+//#### RTTI simulation ############################################################################# -+//################################################################################################## -+ -+class RTTIHolder -+{ -+ static std::map< OString, void* > aAllRTTI; -+public: -+ static void* getRTTI( const OString& rTypename ); -+ static void* getRTTI_UnoName( const OString& rUnoTypename ) -+ { return getRTTI( toRTTIname( rUnoTypename ) ); } -+ -+ static void* insertRTTI( const OString& rTypename ); -+ static void* insertRTTI_UnoName( const OString& rTypename ) -+ { return insertRTTI( toRTTIname( rTypename ) ); } -+ -+ // rSuperTypename MUST exist !!! -+ static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename ); -+ static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename ) -+ { return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); } -+ -+ // for complex RTTI -+ static void* insertRTTI( const OString& rTypename, void* pRTTI ); -+ static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI ) -+ { return insertRTTI( toRTTIname( rTypename ), pRTTI ); } -+}; -+ -+std::map< OString, void* > RTTIHolder::aAllRTTI; -+ -+void* RTTIHolder::getRTTI( const OString& rTypename ) -+{ -+ std::map< OString, void* >::iterator element; -+ -+ element = aAllRTTI.find( rTypename ); -+ return element != aAllRTTI.end() ? (*element).second : NULL; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating base RTTI: %s\n", rTypename.getStr() ); -+#endif -+ void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() ); -+#endif -+ OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" ); -+ void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI ) -+{ -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr ) -+{ -+ OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) ); -+ void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName ); -+ if( pRTTI ) -+ return pRTTI; -+ -+ if( ! pCompTypeDescr->pBaseTypeDescription ) -+ // this is a base type -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName ); -+ if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription ) -+ { -+ OString aBasename( -+ OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) -+ ); -+ if( ! RTTIHolder::getRTTI_UnoName( aBasename ) ) -+ RTTIHolder::insertRTTI_UnoName( aBasename ); -+ -+ // this type has only one supertype -+ return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename ); -+ } -+ -+ // create __si_type_info -+ void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription ); -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+#ifdef DEBUG -+ fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() ); -+#endif -+ pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ), -+ *(__user_type_info*)pSuperRTTI ); -+#if 0 -+ __class_type_info::base_info* pBaseInfo = new __class_type_info::base_info; -+ pBaseInfo->base = (__user_type_info*)pSuperRTTI; -+ pBaseInfo->offset = 0; -+ pBaseInfo->is_virtual = 0; -+ pBaseInfo->access1 = __class_type_info::PUBLIC; -+ -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+ pRTTI = new __class_type_info( -+ strdup( aCompTypeRTTIname.getStr() ), -+ pBaseInfo, -+ 1 -+ ); -+#endif -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI ); -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static Mutex s_aMutex; -+static std::map< void*, typelib_TypeDescription* > aExceptionMap; -+ -+static void deleteException( void* pExc, int nDummy ) -+{ -+ MutexGuard aGuard( s_aMutex ); -+ std::map< void*, typelib_TypeDescription* >::iterator element = -+ aExceptionMap.find( pExc ); -+ OSL_ASSERT( element != aExceptionMap.end() ); -+ if( element != aExceptionMap.end() ) -+ { -+ typelib_TypeDescription* pType = (*element).second; -+ aExceptionMap.erase( pExc ); -+ uno_destructData( pExc, pType, cpp_release ); -+ typelib_typedescription_release( pType ); -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+//################################################################################################## -+//#### exported #################################################################################### -+//################################################################################################## -+ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType ); -+ -+ void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor -+ uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ uno_any_destruct( pUnoExc, 0 ); -+ -+ // a must be -+ OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" ); -+ -+ typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr; -+ void* pRTTI = generateRTTI( pCompTypeDescr ); -+ -+ { -+ MutexGuard aGuard( s_aMutex ); -+ aExceptionMap[ pCppExc ] = pTypeDescr; -+ } -+ -+ __cp_push_exception( pCppExc, pRTTI, deleteException ); -+ __sjthrow(); -+} -+ -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OUString aName( OStringToOUString( -+ toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) ); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ typelib_typedescription_getByName( -+ &pExcTypeDescr, -+ aName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" ); -+ if (pExcTypeDescr) -+ { -+ // construct cpp exception any -+ Any aAny( pInfo->value, pExcTypeDescr ); // const_cast -+ typelib_typedescription_release( pExcTypeDescr ); -+ // construct uno exception any -+ typelib_TypeDescription* pAnyDescr = 0; -+ getCppuType( (const Any *)0 ).getDescription( &pAnyDescr ); -+ uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno ); -+ typelib_typedescription_release( pAnyDescr ); -+ } -+} -+ -+} -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx Tue Jun 4 10:49:36 2002 -@@ -0,0 +1,153 @@ -+/************************************************************************* -+ * -+ * $RCSfile: gcc2_freebsd_intel.hxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#ifndef _RTL_STRING_HXX_ -+#include <rtl/string.hxx> -+#endif -+#include <typeinfo> -+ -+typedef struct _uno_Any uno_Any; -+typedef struct _uno_Mapping uno_Mapping; -+ -+// private egcs type info structs -+ -+// type_info for a simple class ( no base classes or an enum ) -+struct __user_type_info : public std::type_info { -+ __user_type_info (const char *n) : type_info (n) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+// type_info for a class with one public, nonvirtual base class. -+ -+class __si_type_info : public __user_type_info { -+ const __user_type_info &base; -+ -+public: -+ __si_type_info (const char *n, const __user_type_info &b) -+ : __user_type_info (n), base (b) { } -+ -+ // dynamic cast. built by gcc -+ virtual void *dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+// type_info for a general class. -+ -+typedef unsigned int USItype __attribute__ ((mode (SI))); -+ -+struct __class_type_info : public __user_type_info { -+ enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 }; -+ -+ struct base_info { -+ const __user_type_info *base; -+ USItype offset: 29; -+ bool is_virtual: 1; -+ access access1: 2; -+ }; -+ -+ const base_info *base_list; -+ size_t n_bases; -+ -+ __class_type_info (const char *name, const base_info *bl, size_t bn) -+ : __user_type_info (name), base_list (bl), n_bases (bn) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+struct cp_eh_info -+{ -+ struct __eh_info -+ { -+ void* match_function; -+ short language; -+ short version; -+ }; -+ __eh_info eh_info; -+ void *value; -+ void *type; -+ void (*cleanup)(void *, int); -+ bool caught; -+ cp_eh_info *next; -+ long handlers; -+ void *original_value; -+}; -+ -+extern "C" { -+ void __cp_push_exception( void*, void*, void(*)(void*, int) ); -+ void __sjthrow(void) __attribute__ ((__noreturn__)); -+} -+ -+//################################################################################################## -+//#### exceptions ################################################################################## -+//################################################################################################## -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno ); -+ -+} -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk Tue Jun 4 12:20:58 2002 -@@ -0,0 +1,109 @@ -+#************************************************************************* -+# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.1 $ -+# -+# last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc2_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj" -+ -+CFLAGSNOOPT=-O0 -+NOOPTFILES=$(SLO)$/uno2cpp.obj -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF= $(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB= i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx Tue Jun 4 10:49:44 2002 -@@ -0,0 +1,473 @@ -+/************************************************************************* -+ * -+ * $RCSfile: uno2cpp.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <stdlib.h> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+ -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static void callVirtualMethod( void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs, -+ sal_Int32 nThisOffset ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && -+ (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ __asm__ ( -+ // copy values -+ "pushl %%edx\n\t" -+ "pushl %%ecx\n\t" -+ "pushl %%eax\n\t" -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "mov 0(%%edx), %%ecx\n\t" -+ "sub $4, %%edx\n\t" -+ "push %%ecx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n" -+ "Lcall:\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "add $1, %%eax\n\t" // first entry is reserved -+ "shl $3, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov %4, %%eax\n\t" -+ "movswl (%%edx), %%ecx\n\t" -+ "add %%esp, %%eax\n\t" -+ "add %%ecx, (%%eax)\n\t" -+ "mov 4(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %5\n\t" -+ "mov %%edx, %6\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ "popl %%eax\n\t" -+ "popl %%ecx\n\t" -+ "popl %%edx\n\t" -+ : : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), -+ "m"(nThisOffset), "m"(eax), "m"(edx) ); -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__ ( -+ "fstps %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__ ( -+ "fstpl %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ sal_Int32 nThisOffset = 0; -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ nThisOffset = sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32), -+ nThisOffset); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch( ... ) -+ { -+ // get exception -+ cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info(); -+ gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ diff --git a/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel b/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel deleted file mode 100644 index 20b13ea25cb2..000000000000 --- a/editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel +++ /dev/null @@ -1,1608 +0,0 @@ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,594 @@ -+/************************************************************************* -+ * -+ * $RCSfile: cpp2uno.cxx,v $ -+ * -+ * $Revision: 1.3 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <malloc.h> -+#include <hash_map> -+ -+#include <rtl/alloc.h> -+#include <osl/mutex.hxx> -+ -+#include <uno/data.h> -+#include <typelib/typedescription.hxx> -+ -+#include <bridges/cpp_uno/bridge.hxx> -+#include <bridges/cpp_uno/type_misc.hxx> -+ -+#include "share.hxx" -+ -+ -+using namespace ::osl; -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ { -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ } -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( -+ OUString::createFromAscii("illegal vtable index!"), -+ (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( -+ OUString::createFromAscii("no member description found!"), -+ (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+ -+ -+//================================================================================================== -+class MediateClassData -+{ -+ typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map; -+ t_classdata_map m_map; -+ Mutex m_mutex; -+ -+public: -+ void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () ); -+ -+ inline MediateClassData() SAL_THROW( () ) -+ {} -+ ~MediateClassData() SAL_THROW( () ); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() SAL_THROW( () ) -+{ -+ OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." ); -+ -+ for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos ) -+ { -+ ::rtl_freeMemory( iPos->second ); -+ } -+} -+//-------------------------------------------------------------------------------------------------- -+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () ) -+{ -+ if (! simple_ret_type) -+ vtable_pos |= 0x80000000; -+ OSL_ASSERT( sizeof (long) == 4 ); -+ // mov $nPos, %eax -+ *code++ = 0xb8; -+ *(long *)code = vtable_pos; -+ code += sizeof (long); -+ // mov %esp, %edx -+ *code++ = 0x89; -+ *code++ = 0xe2; -+ // jmp cpp_vtable_call -+ *code++ = 0xe9; -+ *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long); -+} -+//__________________________________________________________________________________________________ -+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () ) -+{ -+ void * buffer; -+ -+ // avoiding locked counts -+ OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName; -+ { -+ MutexGuard aGuard( m_mutex ); -+ t_classdata_map::const_iterator iFind( m_map.find( unoName ) ); -+ if (iFind == m_map.end()) -+ { -+ // create new vtable -+ sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex; -+ buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) ); -+ -+ ::std::pair< t_classdata_map::iterator, bool > insertion( -+ m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" ); -+ -+ void ** slots = (void **)buffer; -+ *slots++ = 0; -+ *slots++ = 0; // rtti -+ char * code = (char *)(slots + nSlots); -+ -+ sal_uInt32 vtable_pos = 0; -+ sal_Int32 nAllMembers = pTD->nAllMembers; -+ typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers; -+ for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos ) -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] ); -+ OSL_ASSERT( pTD ); -+ if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass) -+ { -+ bool simple_ret = cppu_isSimpleType( -+ ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass ); -+ // get method -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, simple_ret ); -+ code += 20; -+ if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly) -+ { -+ // set method -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, true ); -+ code += 20; -+ } -+ } -+ else -+ { -+ bool simple_ret = cppu_isSimpleType( -+ ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass ); -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, simple_ret ); -+ code += 20; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ OSL_ASSERT( vtable_pos == nSlots ); -+ } -+ else -+ { -+ buffer = iFind->second; -+ } -+ } -+ -+ return ((void **)buffer +2); -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr ); -+} -+ -+} -+ -+extern "C" -+{ -+//################################################################################################## -+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( -+ &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( -+ pCppEnv ); -+} -+//################################################################################################## -+void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( -+ ppMapping, pFrom, pTo ); -+} -+} ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,317 @@ -+/************************************************************************* -+ * -+ * $RCSfile: except.cxx,v $ -+ * -+ * $Revision: 1.6 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <stdio.h> -+#include <dlfcn.h> -+#include <cxxabi.h> -+#include <hash_map> -+ -+#include <rtl/strbuf.hxx> -+#include <rtl/ustrbuf.hxx> -+#include <osl/diagnose.h> -+#include <osl/mutex.hxx> -+ -+#include <bridges/cpp_uno/bridge.hxx> -+#include <typelib/typedescription.hxx> -+#include <uno/any2.h> -+ -+#include "share.hxx" -+ -+ -+using namespace ::std; -+using namespace ::osl; -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+using namespace ::__cxxabiv1; -+ -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void dummy_can_throw_anything( char const * ) -+{ -+} -+ -+//================================================================================================== -+static OUString toUNOname( char const * p ) SAL_THROW( () ) -+{ -+#ifdef DEBUG -+ char const * start = p; -+#endif -+ -+ // example: N3com3sun4star4lang24IllegalArgumentExceptionE -+ -+ OUStringBuffer buf( 64 ); -+ OSL_ASSERT( 'N' == *p ); -+ ++p; // skip N -+ -+ while ('E' != *p) -+ { -+ // read chars count -+ long n = (*p++ - '0'); -+ while ('0' <= *p && '9' >= *p) -+ { -+ n *= 10; -+ n += (*p++ - '0'); -+ } -+ buf.appendAscii( p, n ); -+ p += n; -+ if ('E' != *p) -+ buf.append( (sal_Unicode)'.' ); -+ } -+ -+#ifdef DEBUG -+ OUString ret( buf.makeStringAndClear() ); -+ OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) ); -+ fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() ); -+ return ret; -+#else -+ return buf.makeStringAndClear(); -+#endif -+} -+ -+//================================================================================================== -+class RTTI -+{ -+ typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; -+ -+ Mutex m_mutex; -+ t_rtti_map m_rttis; -+ t_rtti_map m_generatedRttis; -+ -+ void * m_hApp; -+ -+public: -+ RTTI() SAL_THROW( () ); -+ ~RTTI() SAL_THROW( () ); -+ -+ type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); -+}; -+//__________________________________________________________________________________________________ -+RTTI::RTTI() SAL_THROW( () ) -+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) -+{ -+} -+//__________________________________________________________________________________________________ -+RTTI::~RTTI() SAL_THROW( () ) -+{ -+ dlclose( m_hApp ); -+} -+ -+//__________________________________________________________________________________________________ -+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) -+{ -+ type_info * rtti; -+ -+ OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName; -+ -+ MutexGuard guard( m_mutex ); -+ t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) ); -+ if (iFind == m_rttis.end()) -+ { -+ // RTTI symbol -+ OStringBuffer buf( 64 ); -+ buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") ); -+ sal_Int32 index = 0; -+ do -+ { -+ OUString token( unoName.getToken( 0, '.', index ) ); -+ buf.append( token.getLength() ); -+ OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) ); -+ buf.append( c_token ); -+ } -+ while (index >= 0); -+ buf.append( 'E' ); -+ -+ OString symName( buf.makeStringAndClear() ); -+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -+ -+ if (rtti) -+ { -+ pair< t_rtti_map::iterator, bool > insertion( -+ m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" ); -+ } -+ else -+ { -+ // try to lookup the symbol in the generated rtti map -+ t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); -+ if (iFind == m_generatedRttis.end()) -+ { -+ // we must generate it ! -+ // symbol and rtti-name is nearly identical, -+ // the symbol is prefixed with _ZTI -+ char const * rttiName = symName.getStr() +4; -+#ifdef DEBUG -+ fprintf( stderr,"generated rtti for %s\n", rttiName ); -+#endif -+ if (pTypeDescr->pBaseTypeDescription) -+ { -+ // ensure availability of base -+ type_info * base_rtti = getRTTI( -+ (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); -+ rtti = new __si_class_type_info( -+ strdup( rttiName ), (__class_type_info *)base_rtti ); -+ } -+ else -+ { -+ // this class has no base class -+ rtti = new __class_type_info( strdup( rttiName ) ); -+ } -+ -+ pair< t_rtti_map::iterator, bool > insertion( -+ m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" ); -+ } -+ else // taking already generated rtti -+ { -+ rtti = iFind->second; -+ } -+ } -+ } -+ else -+ { -+ rtti = iFind->second; -+ } -+ -+ return rtti; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+static void deleteException( void * pExc ) -+{ -+ __cxa_exception const * header = ((__cxa_exception const *)pExc - 1); -+ typelib_TypeDescription * pTD = 0; -+ OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ ::typelib_typedescription_getByName( &pTD, unoName.pData ); -+ OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" ); -+ if (pTD) -+ { -+ ::uno_destructData( pExc, pTD, cpp_release ); -+ ::typelib_typedescription_release( pTD ); -+ } -+} -+ -+//================================================================================================== -+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ void * pCppExc; -+ type_info * rtti; -+ -+ { -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType ); -+ OSL_ASSERT( pTypeDescr ); -+ if (! pTypeDescr) -+ terminate(); -+ -+ pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); -+ ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ ::uno_any_destruct( pUnoExc, 0 ); -+ // avoiding locked counts -+ static RTTI * s_rtti = 0; -+ if (! s_rtti) -+ { -+ MutexGuard guard( Mutex::getGlobalMutex() ); -+ if (! s_rtti) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_rtti = new RTTI(); -+#else -+ static RTTI rtti_data; -+ s_rtti = &rtti_data; -+#endif -+ } -+ } -+ rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr ); -+ TYPELIB_DANGER_RELEASE( pTypeDescr ); -+ OSL_ENSURE( rtti, "### no rtti for throwing exception!" ); -+ if (! rtti) -+ terminate(); -+ } -+ -+ __cxa_throw( pCppExc, rtti, deleteException ); -+} -+ -+//================================================================================================== -+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OSL_ENSURE( header, "### no exception header!!!" ); -+ if (! header) -+ terminate(); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" ); -+ if (! pExcTypeDescr) -+ terminate(); -+ -+ // construct uno exception any -+ ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno ); -+ ::typelib_typedescription_release( pExcTypeDescr ); -+} -+ -+} -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Mon Mar 4 21:24:53 2002 -@@ -0,0 +1,112 @@ -+#************************************************************************* -+# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.2 $ -+# -+# last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc3_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" -+ -+.IF "$(cppu_no_leak)" == "" -+CFLAGS += -DLEAK_STATIC_DATA -+.ENDIF -+ -+CFLAGSNOOPT=-O0 -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB=i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,120 @@ -+/************************************************************************* -+ * -+ * $RCSfile: share.hxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <typeinfo> -+#include <exception> -+#include <cstddef> -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h -+ -+struct _Unwind_Exception -+{ -+ unsigned exception_class __attribute__((__mode__(__DI__))); -+ void * exception_cleanup; -+ unsigned private_1 __attribute__((__mode__(__word__))); -+ unsigned private_2 __attribute__((__mode__(__word__))); -+} __attribute__((__aligned__)); -+ -+struct __cxa_exception -+{ -+ ::std::type_info *exceptionType; -+ void (*exceptionDestructor)(void *); -+ -+ ::std::unexpected_handler unexpectedHandler; -+ ::std::terminate_handler terminateHandler; -+ -+ __cxa_exception *nextException; -+ -+ int handlerCount; -+ -+ int handlerSwitchValue; -+ const unsigned char *actionRecord; -+ const unsigned char *languageSpecificData; -+ void *catchTemp; -+ void *adjustedPtr; -+ -+ _Unwind_Exception unwindHeader; -+}; -+ -+extern "C" void *__cxa_allocate_exception( -+ std::size_t thrown_size ) throw(); -+extern "C" void __cxa_throw ( -+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); -+ -+struct __cxa_eh_globals -+{ -+ __cxa_exception *caughtExceptions; -+ unsigned int uncaughtExceptions; -+}; -+extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -+ -+// ----- -+ -+//================================================================================================== -+void raiseException( -+ uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+//================================================================================================== -+void fillUnoException( -+ __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); -+} ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,450 @@ -+/************************************************************************* -+ * -+ * $RCSfile: uno2cpp.cxx,v $ -+ * -+ * $Revision: 1.3 $ -+ * -+ * last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <malloc.h> -+#include <rtl/alloc.h> -+ -+#include <uno/data.h> -+#include <bridges/cpp_uno/bridge.hxx> -+#include <bridges/cpp_uno/type_misc.hxx> -+ -+#include "share.hxx" -+ -+ -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void dummy_can_throw_anything( char const * ); -+ -+//================================================================================================== -+static void callVirtualMethod( -+ void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ // never called -+ if (! pThis) dummy_can_throw_anything("xxx"); // address something -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ asm volatile ( -+ // copy values -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "pushl 0(%%edx)\n\t" -+ "sub $4, %%edx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %4\n\t" -+ "mov %%edx, %5\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ : -+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) -+ : "eax", "edx" ); -+ -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch (...) -+ { -+ // fill uno exception -+ fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ diff --git a/editors/openoffice-3-devel/files/patch-bridges::source::prot_uno::makefile.mk b/editors/openoffice-3-devel/files/patch-bridges::source::prot_uno::makefile.mk deleted file mode 100644 index 595ea6cb5ac9..000000000000 --- a/editors/openoffice-3-devel/files/patch-bridges::source::prot_uno::makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001 -+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002 -@@ -88,8 +88,8 @@ - SHL1VERSIONMAP=..$/bridge_exports.map - - SHL1STDLIBS= \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ $(CPPULIB) - - DEF1NAME=$(SHL1TARGET) - diff --git a/editors/openoffice-3-devel/files/patch-comphelper::util::makefile.mk b/editors/openoffice-3-devel/files/patch-comphelper::util::makefile.mk deleted file mode 100644 index 997719c43dd8..000000000000 --- a/editors/openoffice-3-devel/files/patch-comphelper::util::makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../comphelper/util/makefile.mk.orig Tue Feb 19 13:26:37 2002 -+++ ../comphelper/util/makefile.mk Wed Apr 3 00:16:43 2002 -@@ -85,11 +85,11 @@ - - SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR) - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VOSLIB) \ - $(OSLLIB) \ -- $(SALLIB) \ - $(CPPRTLLIB) - - .IF "$(OS)$(CPU)"=="SOLARISS" diff --git a/editors/openoffice-3-devel/files/patch-config_office::configure.in b/editors/openoffice-3-devel/files/patch-config_office::configure.in deleted file mode 100644 index b10dca2be517..000000000000 --- a/editors/openoffice-3-devel/files/patch-config_office::configure.in +++ /dev/null @@ -1,48 +0,0 @@ ---- configure.in.orig Wed Oct 2 21:22:53 2002 -+++ configure.in Sat Oct 19 00:09:27 2002 -@@ -356,6 +356,9 @@ - - dnl Set the include paths - _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+ if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then -+ _gcc_include_path="/usr/include" -+ fi - fi - - dnl =================================================================== -@@ -374,20 +377,20 @@ - if test -z "$GNUMAKE"; then - AC_MSG_WARN([not found build may fail]) >> warn - else -- _make_version=`make --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`; -+ _make_version=`gmake --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`; - _make_major=`echo $_make_version | $AWK -F. '{print $1;}'` - _make_middle=`echo $_make_version | $AWK -F. '{ print $2; }'` - _make_minor=`echo $_make_version | $AWK -F. '{ print $3; }'` - if test "$_make_major" -gt "3" ; then -- AC_MSG_RESULT([checked (make $_make_version)]) -+ AC_MSG_RESULT([checked (gmake $_make_version)]) - else - if test "$_make_middle" -gt "79" ; then -- AC_MSG_RESULT([checked (make $_make_version)]) -+ AC_MSG_RESULT([checked (gmake $_make_version)]) - else - if test "$_make_minor" -ge "1" ; then -- AC_MSG_RESULT([checked (make $_make_version)]) -+ AC_MSG_RESULT([checked (gmake $_make_version)]) - else -- AC_MSG_ERROR([failed (make $_make_version need 3.79.1+)]) -+ AC_MSG_ERROR([failed (gmake $_make_version need 3.79.1+)]) - fi - fi - fi -@@ -551,6 +554,9 @@ - dnl =================================================================== - if test "$GXX" = "yes"; then - _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+ if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then -+ _gxx_include_path="/usr/include" -+ fi - fi - - diff --git a/editors/openoffice-3-devel/files/patch-config_office::set_soenv.in b/editors/openoffice-3-devel/files/patch-config_office::set_soenv.in deleted file mode 100644 index 4652de66bcfa..000000000000 --- a/editors/openoffice-3-devel/files/patch-config_office::set_soenv.in +++ /dev/null @@ -1,23 +0,0 @@ ---- set_soenv.in.orig Sat Oct 19 12:16:51 2002 -+++ set_soenv.in Sat Oct 19 12:17:36 2002 -@@ -933,6 +933,9 @@ - elsif ($platform eq "$FreeBSD") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -+ $ps.$JRELIBDIR. -+ $ps.$JRETOOLKITDIR. -+ $ps.$JRETHREADDIR. - $ps.$par_dir.$LIB. - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; -@@ -1092,6 +1095,10 @@ - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. - $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. - $ps.'$SOLARENV'.$BIN; -+ if ( $JAVA_HOME ne "" ) -+ { -+ $PATH .= $ps.'$JAVA_HOME'.$BIN; -+ } - - $PATH .= $ps.$oldPATH; - } diff --git a/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk b/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk deleted file mode 100644 index f99a49c36067..000000000000 --- a/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Aug 19 19:23:47 2002 -+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Oct 16 00:01:36 2002 -@@ -167,7 +167,9 @@ - - # --- MOZAB BASE Library ----------------------------------- - -+.IF "$(OS)"!="FREEBSD" - SHL2VERSIONMAP= $(TARGET2).map -+.ENDIF - SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR) - SHL2OBJS=$(SLO2FILES) - SHL2STDLIBS=\ diff --git a/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk deleted file mode 100644 index 3601766ee561..000000000000 --- a/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002 -@@ -64,8 +64,8 @@ - #mozilla specific stuff. - MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla --#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib --#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla - #End of mozilla specific stuff. - - PRJ=..$/..$/..$/.. -@@ -107,7 +107,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -123,7 +123,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -141,7 +141,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI - .IF "$(OS)" == "LINUX" -@@ -157,6 +157,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "FREEBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread - CDEFS += -DTRACING - .ENDIF - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozaddressbook::makefile.mk b/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozaddressbook::makefile.mk deleted file mode 100644 index b63d2a25f184..000000000000 --- a/editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozaddressbook::makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../connectivity/source/drivers/mozaddressbook/makefile.mk.orig Wed Jun 12 01:40:36 2002 -+++ ../connectivity/source/drivers/mozaddressbook/makefile.mk Wed Jun 12 01:40:37 2002 -@@ -134,9 +134,7 @@ - SLOFILES+=$(SLO)$/staticmbmozab.obj - .ENDIF - --.IF "$(OS)"!="FREEBSD" - SHL1VERSIONMAP= $(TARGET).map --.ENDIF - # --- Library ----------------------------------- - - SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) diff --git a/editors/openoffice-3-devel/files/patch-cosv::source::strings::streamstr.cxx b/editors/openoffice-3-devel/files/patch-cosv::source::strings::streamstr.cxx deleted file mode 100644 index 5bdb940ec43b..000000000000 --- a/editors/openoffice-3-devel/files/patch-cosv::source::strings::streamstr.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cosv/source/strings/streamstr.cxx.orig Tue Aug 13 14:29:52 2002 -+++ ../cosv/source/strings/streamstr.cxx Fri Oct 18 20:20:41 2002 -@@ -65,7 +65,7 @@ - // NOT FULLY DECLARED SERVICES - #include <string.h> - #include <stdio.h> --#if defined(WNT) || defined(LINUX) || defined(MACOSX) -+#if defined(WNT) || defined(LINUX) || defined(MACOSX) || defined(FREEBSD) - #include <stdarg.h> - #else - #include <sys/varargs.h> diff --git a/editors/openoffice-3-devel/files/patch-cppu::inc::cppu::macros.hxx b/editors/openoffice-3-devel/files/patch-cppu::inc::cppu::macros.hxx deleted file mode 100644 index dad8a1f99a5c..000000000000 --- a/editors/openoffice-3-devel/files/patch-cppu::inc::cppu::macros.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002 -+++ ../cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002 -@@ -76,7 +76,7 @@ - the struct inherits from a base struct the first member is no double or [unsigned] long long. - @internal - */ --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) - #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct)))) - #else - #define CPPU_GCC3_ALIGN( base_struct ) diff --git a/editors/openoffice-3-devel/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice-3-devel/files/patch-cppu::inc::uno::lbnames.h deleted file mode 100644 index cb43c2d165e9..000000000000 --- a/editors/openoffice-3-devel/files/patch-cppu::inc::uno::lbnames.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002 -+++ ../cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002 -@@ -94,7 +94,7 @@ - #define __CPPU_ENV gcc2 - #elif (__GNUC__ == 2) - #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." --#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0) -+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) - #define __CPPU_ENV gcc3 - #elif (__GNUC__ == 3) - #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." diff --git a/editors/openoffice-3-devel/files/patch-cppu::prj::build.lst b/editors/openoffice-3-devel/files/patch-cppu::prj::build.lst deleted file mode 100644 index 78fd210a1193..000000000000 --- a/editors/openoffice-3-devel/files/patch-cppu::prj::build.lst +++ /dev/null @@ -1,8 +0,0 @@ ---- ../cppu/prj/build.lst.orig Mon Mar 11 14:13:47 2002 -+++ ../cppu/prj/build.lst Mon Mar 11 14:14:30 2002 -@@ -1,4 +1,4 @@ --cu cppu : codemaker udkapi NULL -+cu cppu : codemaker udkapi offuh NULL - cu cppu usr1 - all cu_mkout NULL - cu cppu\source nmake - all cu_source NULL - cu cppu\source\uno nmake - all cu_uno cu_source NULL diff --git a/editors/openoffice-3-devel/files/patch-cppu::source::uno::data.cxx b/editors/openoffice-3-devel/files/patch-cppu::source::uno::data.cxx deleted file mode 100644 index 9c0e34bfb60b..000000000000 --- a/editors/openoffice-3-devel/files/patch-cppu::source::uno::data.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002 -+++ ../cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002 -@@ -295,7 +295,7 @@ - # pragma pack(8) - #endif - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define MAX_ALIGNMENT_4 - #endif - -@@ -307,7 +307,7 @@ - if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); } - - #ifdef DEBUG --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) - #define BINTEST_VERIFYSIZE( s, n ) \ - fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ - if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } diff --git a/editors/openoffice-3-devel/files/patch-cppu::test::alignment::diagnose.h b/editors/openoffice-3-devel/files/patch-cppu::test::alignment::diagnose.h deleted file mode 100644 index 2a6650400a1e..000000000000 --- a/editors/openoffice-3-devel/files/patch-cppu::test::alignment::diagnose.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002 -+++ ../cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002 -@@ -64,7 +64,7 @@ - #include <sal/types.h> - #include <stdio.h> - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define __ALIGNMENT__(s, n) __alignof__ (s) - #else - #define __ALIGNMENT__(s, n) n diff --git a/editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk deleted file mode 100644 index 62e971de324a..000000000000 --- a/editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk +++ /dev/null @@ -1,24 +0,0 @@ ---- ../cppuhelper/source/makefile.mk.orig Mon Mar 11 22:17:52 2002 -+++ ../cppuhelper/source/makefile.mk Wed Apr 3 00:31:19 2002 -@@ -149,8 +149,8 @@ - SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) - - SHL1STDLIBS= \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ $(CPPULIB) - - SHL1DEPN= - SHL1IMPLIB=i$(TARGET) -@@ -175,6 +175,10 @@ - #SHL1VERSIONMAP=gcc2_freebsd_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+#SHL1VERSIONMAP=gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+#SHL1VERSIONMAP=gcc3_freebsd_intel.map - .ENDIF - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice-3-devel/files/patch-cpputools::source::registercomponent::makefile.mk b/editors/openoffice-3-devel/files/patch-cpputools::source::registercomponent::makefile.mk deleted file mode 100644 index 8134445349f1..000000000000 --- a/editors/openoffice-3-devel/files/patch-cpputools::source::registercomponent::makefile.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 -+++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 -@@ -104,6 +104,7 @@ - - APP1STDLIBS=\ - $(SALLIB) \ -+ $(TOOLSLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - diff --git a/editors/openoffice-3-devel/files/patch-desktop::util::makefile.mk b/editors/openoffice-3-devel/files/patch-desktop::util::makefile.mk deleted file mode 100644 index 8ceb57682cc7..000000000000 --- a/editors/openoffice-3-devel/files/patch-desktop::util::makefile.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- ../desktop/util/makefile.mk.orig Sun Jul 21 00:04:35 2002 -+++ ../desktop/util/makefile.mk Sun Jul 21 00:04:38 2002 -@@ -81,7 +81,7 @@ - - # --- Linken der Applikation --------------------------------------- - --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, - # winXX is handled like solaris for now - APP1_STDPRE= -@@ -111,7 +111,7 @@ - $(SALHELPERLIB) - - .IF "$(GUI)" == "UNX" --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - - APP1STDLIBS+= -lXext -lSM -lICE - diff --git a/editors/openoffice-3-devel/files/patch-dmake::unix::linux::gnu::make.sh b/editors/openoffice-3-devel/files/patch-dmake::unix::linux::gnu::make.sh deleted file mode 100644 index d60afa8e32e8..000000000000 --- a/editors/openoffice-3-devel/files/patch-dmake::unix::linux::gnu::make.sh +++ /dev/null @@ -1,244 +0,0 @@ ---- ../dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002 -+++ ../dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002 -@@ -3,188 +3,188 @@ - mkdir objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - fi - mv infer.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - fi - mv make.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - fi - mv stat.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - fi - mv expand.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - fi - mv dmstring.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - fi - mv hash.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - fi - mv dag.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - fi - mv dmake.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - fi - mv path.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - fi - mv imacs.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - fi - mv sysintf.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - fi - mv parse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - fi - mv getinp.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - fi - mv quit.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - fi - mv state.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - fi - mv dmdump.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - fi - mv macparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - fi - mv rulparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - fi - mv percent.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - fi - mv function.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - fi - mv arlib.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - fi - mv dirbrk.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - fi - mv rmprq.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - fi - mv ruletab.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - fi - mv runargv.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - fi - mv dcache.o objects - --gcc -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ -+${CC} ${CFLAGS} -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ - objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \ - objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \ - objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \ diff --git a/editors/openoffice-3-devel/files/patch-dtrans::source::X11::X11_selection.cxx b/editors/openoffice-3-devel/files/patch-dtrans::source::X11::X11_selection.cxx deleted file mode 100644 index 77df99f679ab..000000000000 --- a/editors/openoffice-3-devel/files/patch-dtrans::source::X11::X11_selection.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../dtrans/source/X11/X11_selection.cxx.orig Wed Jul 31 22:43:56 2002 -+++ ../dtrans/source/X11/X11_selection.cxx Fri Oct 18 20:16:37 2002 -@@ -66,7 +66,7 @@ - #include <X11/keysym.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> --#ifdef LINUX -+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) - #include <sys/poll.h> - #else - #include <poll.h> diff --git a/editors/openoffice-3-devel/files/patch-dtrans::source::X11::makefile.mk b/editors/openoffice-3-devel/files/patch-dtrans::source::X11::makefile.mk deleted file mode 100644 index 5881f5d7f6a5..000000000000 --- a/editors/openoffice-3-devel/files/patch-dtrans::source::X11::makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../dtrans/source/X11/makefile.mk.orig Tue Dec 11 18:48:36 2001 -+++ ../dtrans/source/X11/makefile.mk Wed Apr 3 00:31:56 2002 -@@ -116,7 +116,8 @@ - APP1STDLIBS=\ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ -lX11 - - .ENDIF # "$(OS)"=="MACOSX" - diff --git a/editors/openoffice-3-devel/files/patch-eventattacher::source::makefile.mk b/editors/openoffice-3-devel/files/patch-eventattacher::source::makefile.mk deleted file mode 100644 index b09408500c2d..000000000000 --- a/editors/openoffice-3-devel/files/patch-eventattacher::source::makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002 -+++ ../eventattacher/source/makefile.mk -@@ -110,10 +110,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(VOSLIB) \ -- $(SALLIB) -+ $(VOSLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-external::dt::dtpatch.sh b/editors/openoffice-3-devel/files/patch-external::dt::dtpatch.sh deleted file mode 100644 index e5122bcb45c1..000000000000 --- a/editors/openoffice-3-devel/files/patch-external::dt::dtpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002 -+++ ../external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002 -@@ -96,7 +96,7 @@ - done - - chmod -R +w rtufiles/*.h -- patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch -+ patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch - - if test -s "patcherror"; then - echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror diff --git a/editors/openoffice-3-devel/files/patch-external::neon::md5.c.pat b/editors/openoffice-3-devel/files/patch-external::neon::md5.c.pat deleted file mode 100644 index 46c5e062128e..000000000000 --- a/editors/openoffice-3-devel/files/patch-external::neon::md5.c.pat +++ /dev/null @@ -1,112 +0,0 @@ ---- /dev/null Thu Aug 8 22:39:51 2002 -+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002 -@@ -0,0 +1,109 @@ -+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001 -+--- sub\md5.c Tue May 08 12:52:02 2001 -+*************** -+*** 278,290 **** -+ const void *buffer; -+ size_t len; -+ struct md5_ctx *ctx; -+ { -+ md5_uint32 correct_words[16]; -+! const md5_uint32 *words = buffer; -+! size_t nwords = len / sizeof (md5_uint32); -+! const md5_uint32 *endp = words + nwords; -+ md5_uint32 A = ctx->A; -+ md5_uint32 B = ctx->B; -+ md5_uint32 C = ctx->C; -+ md5_uint32 D = ctx->D; -+ -+--- 278,289 ---- -+ const void *buffer; -+ size_t len; -+ struct md5_ctx *ctx; -+ { -+ md5_uint32 correct_words[16]; -+! const unsigned char *words = buffer; -+! const unsigned char *endp = words + len; -+ md5_uint32 A = ctx->A; -+ md5_uint32 B = ctx->B; -+ md5_uint32 C = ctx->C; -+ md5_uint32 D = ctx->D; -+ -+*************** -+*** 313,324 **** -+ we store the swapped words in the array CORRECT_WORDS. */ -+ -+ #define OP(a, b, c, d, s, T) \ -+ do \ -+ { \ -+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ -+! ++words; \ -+ CYCLIC (a, s); \ -+ a += b; \ -+ } \ -+ while (0) -+ -+--- 312,325 ---- -+ we store the swapped words in the array CORRECT_WORDS. */ -+ -+ #define OP(a, b, c, d, s, T) \ -+ do \ -+ { \ -+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \ -+! | (words[2] << 16) | (words[3] << 24); \ -+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \ -+! words += 4; \ -+ CYCLIC (a, s); \ -+ a += b; \ -+ } \ -+ while (0) -+ -+*************** -+*** 431,441 **** -+ ctx->D = D; -+ } -+ -+ /* Writes the ASCII representation of the MD5 digest into the -+ * given buffer, which must be at least 33 characters long. */ -+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4); -+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f); -+--- 432,442 ---- -+ ctx->D = D; -+ } -+ -+ /* Writes the ASCII representation of the MD5 digest into the -+ * given buffer, which must be at least 33 characters long. */ -+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4); -+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f); -+*************** -+*** 443,453 **** -+ buffer[32] = '\0'; -+ } -+ -+ /* Reads the ASCII representation of an MD5 digest. The buffer must -+ * be at least 32 characters long. */ -+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) | -+ ASC2HEX(buffer[count*2+1]); -+--- 444,454 ---- -+ buffer[32] = '\0'; -+ } -+ -+ /* Reads the ASCII representation of an MD5 digest. The buffer must -+ * be at least 32 characters long. */ -+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) | -+ ASC2HEX(buffer[count*2+1]); diff --git a/editors/openoffice-3-devel/files/patch-external::npsdk::npsdkpatch.sh b/editors/openoffice-3-devel/files/patch-external::npsdk::npsdkpatch.sh deleted file mode 100644 index 49a3056831dd..000000000000 --- a/editors/openoffice-3-devel/files/patch-external::npsdk::npsdkpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002 -+++ ../external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002 -@@ -121,7 +121,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -+ patch < pat/$PNAME.pat rtufiles/$PNAME - done - - # diff --git a/editors/openoffice-3-devel/files/patch-i18npool::inc::collatorImpl.hxx b/editors/openoffice-3-devel/files/patch-i18npool::inc::collatorImpl.hxx deleted file mode 100644 index 47d4ee627fc9..000000000000 --- a/editors/openoffice-3-devel/files/patch-i18npool::inc::collatorImpl.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../i18npool/inc/collatorImpl.hxx.orig Fri Oct 18 19:35:02 2002 -+++ ../i18npool/inc/collatorImpl.hxx Fri Oct 18 19:35:26 2002 -@@ -71,7 +71,7 @@ - #include <cppuhelper/implbase2.hxx> - #include <com/sun/star/lang/XServiceInfo.hpp> - --#if !defined( WIN32 ) && !defined( MACOSX ) -+#if !defined( WIN32 ) && !defined( MACOSX ) && !defined( FREEBSD) - #include <alloca.h> - #endif - #include <tools/list.hxx> diff --git a/editors/openoffice-3-devel/files/patch-idl::util::makefile.mk b/editors/openoffice-3-devel/files/patch-idl::util::makefile.mk deleted file mode 100644 index 2543593dd210..000000000000 --- a/editors/openoffice-3-devel/files/patch-idl::util::makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002 -+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002 -@@ -110,7 +110,7 @@ - .ENDIF - .ENDIF - --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - APP1STDLIBS+=-lcrypt - .ENDIF - diff --git a/editors/openoffice-3-devel/files/patch-javaunohelper::source::makefile.mk b/editors/openoffice-3-devel/files/patch-javaunohelper::source::makefile.mk deleted file mode 100644 index 7f2cd2f1d220..000000000000 --- a/editors/openoffice-3-devel/files/patch-javaunohelper::source::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002 -+++ ../javaunohelper/source/makefile.mk -@@ -110,9 +110,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-moz::prj::d.lst b/editors/openoffice-3-devel/files/patch-moz::prj::d.lst deleted file mode 100644 index d65f2df6cf3b..000000000000 --- a/editors/openoffice-3-devel/files/patch-moz::prj::d.lst +++ /dev/null @@ -1,34 +0,0 @@ ---- ../moz/prj/d.lst Sat May 18 16:06:23 2002 -+++ ../moz/prj/d.lst Sat May 18 16:16:33 2002 -@@ -43,6 +43,7 @@ - mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul - mkdir: %_DEST%\inc%_EXT%\mozilla\ldap - mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap -+mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr - mkdir: %_DEST%\inc%_EXT%\mozilla\locale - mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk - mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews -@@ -71,6 +72,7 @@ - mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private - mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm - mkdir: %_DEST%\inc%_EXT%\mozilla\oji -+mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete - mkdir: %_DEST%\inc%_EXT%\mozilla\plugin - mkdir: %_DEST%\inc%_EXT%\mozilla\png - mkdir: %_DEST%\inc%_EXT%\mozilla\pref -@@ -158,6 +160,7 @@ - ..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul - ..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap - ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap -+..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr - ..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale - ..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk - ..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews -@@ -186,6 +189,7 @@ - ..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private - ..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm - ..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji -+..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete - ..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin - ..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png - ..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref diff --git a/editors/openoffice-3-devel/files/patch-nas:nas-1.4.1.patch b/editors/openoffice-3-devel/files/patch-nas:nas-1.4.1.patch deleted file mode 100644 index 8623e0bd5892..000000000000 --- a/editors/openoffice-3-devel/files/patch-nas:nas-1.4.1.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001 -+++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002 -@@ -120,26 +120,139 @@ - return(-1); - } - --*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000 ----- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001 --*************** --*** 25,30 **** ----- 25,32 ---- -- -- #include "../../config/NetAudio.tmpl" -- --+ CCOPTIONS += $(EXTRA_CCOPTIONS) --+ -- #if ProjectX < 5 -- /* Pre-X11R5 compatability */ -- #ifndef NormalLibX --*************** --*** 119,124 **** ----- 121,127 ---- -- -- #endif -- BuildIncludes($(HEADERS),audio,..) --+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -- InstallMultiple($(HEADERS),$(INCDIR)) -- #if ProjectX >= 5 -- InstallNonExecFile(AuErrorDB,$(LIBDIR)) -+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002 -++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002 -+@@ -42,6 +42,8 @@ -+ @echo "" -+ Date -+ @echo "" -++ @find . | egrep "\.(cxx|h|c)$$" | xargs \ -++ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g" -+ $(MAKE) $(MFLAGS) Makefiles -+ $(MAKE) $(MFLAGS) clean -+ $(MAKE) $(MFLAGS) includes -+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997 -++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997 -+@@ -133,6 +133,7 @@ -+ signal(SIGALRM, SIG_DFL); -+ } -+ -++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3) -+ static void -+ usleep(usecs) -+ unsigned int usecs; -+@@ -149,7 +150,7 @@ -+ setitimer(ITIMER_REAL, &ntval, &otval); -+ pause(); -+ } -+- -++#endif -+ #endif /* SYSV else not */ -+ #endif /* VMS else not */ -+ #endif /* NEEDUSLEEP */ -+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000 -++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000 -+@@ -155,8 +155,10 @@ -+ #include <assert.h> -+ -+ #ifdef __FreeBSD__ -+-# include <machine/soundcard.h> -+-# include <machine/pcaudioio.h> -++# include <sys/soundcard.h> -++# ifdef __i386__ -++# include <machine/pcaudioio.h> -++# endif -+ #else -+ # ifdef __NetBSD__ -+ # include <sys/ioctl.h> -+@@ -610,7 +612,11 @@ -+ -+ if(sndStatOut.fd == -1) -+ { -++#ifdef __FreeBSD__ -++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait) -++#else -+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait) -++#endif -+ { -+ osLogMsg("openDevice: waiting on output device\n"); -+ sleep(1); -+@@ -1230,6 +1236,11 @@ -+ /* -+ * Setup soundcard at maximum audio quality. -+ */ -++ -++#ifdef __FreeBSD__ -++#define NO_16_BIT_SAMPLING -++#endif -++ -+ static void setupSoundcard(sndStatPtr) -+ SndStat* sndStatPtr; -+ { -+@@ -1380,7 +1391,11 @@ -+ -+ AL_initialized = AuTrue; -+ -++#ifdef __FreeBSD__ -++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) { -++#else -+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) { -++#endif -+ UNIDENTMSG; -+ return AuFalse; -+ } -+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999 -++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000 -+@@ -28,7 +28,7 @@ -+ */ -+ -+ #ifndef WIN32 -+-# ifdef __NetBSD__ -++# if defined(__NetBSD__) || defined(__FreeBSD__) -+ # include <limits.h> -+ # define MAXSHORT SHRT_MAX -+ # define MINSHORT SHRT_MIN -+--- misc/nas-1.4.1/lib/audio/Imakefile.orig Sun May 19 14:52:20 2002 -++++ misc/build/nas-1.4.1/lib/audio/Imakefile Sun May 19 14:54:25 2002 -+@@ -25,6 +25,8 @@ -+ -+ #include "../../config/NetAudio.tmpl" -+ -++CCOPTIONS += $(EXTRA_CCOPTIONS) -++ -+ #if ProjectX < 5 -+ /* Pre-X11R5 compatability */ -+ #ifndef NormalLibX -+@@ -64,10 +66,14 @@ -+ COMPAT_OBJS = AuGetBest.o -+ #endif /* ProjectX < 5 */ -+ -++#if HasBSD44Sockets -++ SOCK_DEFINES = -DBSD44SOCKETS -++#endif -++ -+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\" -+ -+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES) -+- CONN_DEFINES = ConnectionFlags -++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES) -+ -+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \ -+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \ -+@@ -119,6 +125,7 @@ -+ -+ #endif -+ BuildIncludes($(HEADERS),audio,..) -++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -+ InstallMultiple($(HEADERS),$(INCDIR)) -+ #if ProjectX >= 5 -+ InstallNonExecFile(AuErrorDB,$(LIBDIR)) -+--- misc/nas-1.4.1/config/NetAudio.def.orig Sun Feb 13 05:31:14 2000 -++++ misc/build/nas-1.4.1/config/NetAudio.def Fri Mar 24 04:55:49 2000 -+@@ -8,5 +8,5 @@ -+ -+ XCOMM Directory where NAS will look for it's config file(s) -+ #ifndef NasConfigSearchPath -+-#define NasConfigSearchPath /etc/nas/ -++#define NasConfigSearchPath $(PROJECTROOT)/etc/ -+ #endif -+--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002 -++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002 -+@@ -120,7 +120,7 @@ -+ -+ void ddxUseMsg(void); -+ -+-#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX) -++#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX) && !defined(__FreeBSD__) -+ extern char *sbrk(); -+ #endif -+ diff --git a/editors/openoffice-3-devel/files/patch-odk::pack::unzip_udk::makefile.mk b/editors/openoffice-3-devel/files/patch-odk::pack::unzip_udk::makefile.mk deleted file mode 100644 index c90775d4162c..000000000000 --- a/editors/openoffice-3-devel/files/patch-odk::pack::unzip_udk::makefile.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../odk/pack/unzip_udk/makefile.mk.orig Thu Aug 8 09:28:10 2002 -+++ ../odk/pack/unzip_udk/makefile.mk Fri Oct 18 20:14:46 2002 -@@ -44,9 +44,15 @@ - .ELSE - $(GNUCOPY) -p $(UDKPATH) . - $(GNUCOPY) -p $(ODKDOCPATH) . -+.IF "$(OS)"=="FREEBSD" -+ tar -xzf $(UDKZIPPREFIX).tar.gz -+ +-$(RENAME) $(UDKNAME) $(ODKNAME) -+ tar -xzf $(ODKDOCNAME).tar.gz -+.ELSE - gzip -df < $(UDKZIPPREFIX).tar.gz | tar -xvf - - +-$(RENAME) $(UDKNAME) $(ODKNAME) - gzip -df < $(ODKDOCNAME).tar.gz | tar -xvf - -+.ENDIF - .ENDIF - .IF "$(BUILD_SOSL)"!="" - # for OpenOffice build rename to PRODUCT_NAME diff --git a/editors/openoffice-3-devel/files/patch-offapi::com::sun::star::setup::OSType.idl b/editors/openoffice-3-devel/files/patch-offapi::com::sun::star::setup::OSType.idl deleted file mode 100644 index 3fee562c6d38..000000000000 --- a/editors/openoffice-3-devel/files/patch-offapi::com::sun::star::setup::OSType.idl +++ /dev/null @@ -1,12 +0,0 @@ ---- ../offapi/com/sun/star/setup/OSType.idl.orig Mon Dec 18 16:34:26 2000 -+++ ../offapi/com/sun/star/setup/OSType.idl Sun Jul 21 01:37:15 2002 -@@ -88,6 +88,9 @@ - UNIX_LINUX, - - // DocMerge: empty anyway -+ UNIX_FREEBSD, -+ -+ // DocMerge: empty anyway - UNIX_HP, - - // DocMerge: empty anyway diff --git a/editors/openoffice-3-devel/files/patch-offapi::util::makefile.pmk b/editors/openoffice-3-devel/files/patch-offapi::util::makefile.pmk deleted file mode 100644 index 5cdbb1b4aa4a..000000000000 --- a/editors/openoffice-3-devel/files/patch-offapi::util::makefile.pmk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../offapi/util/makefile.pmk.orig Mon Mar 11 01:37:55 2002 -+++ ../offapi/util/makefile.pmk Mon Mar 11 01:37:57 2002 -@@ -85,7 +85,7 @@ - - URDDOC=TRUE - --.IF "$(OS)"=="SOLARIS" -+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - .IF "$(CPU)"=="I" - UNOIDL=unoidl - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-package::inc::HashMaps.hxx b/editors/openoffice-3-devel/files/patch-package::inc::HashMaps.hxx deleted file mode 100644 index 35052d291ef7..000000000000 --- a/editors/openoffice-3-devel/files/patch-package::inc::HashMaps.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../package/inc/HashMaps.hxx.orig Tue Oct 30 14:52:18 2001 -+++ ../package/inc/HashMaps.hxx Wed Jun 12 23:10:42 2002 -@@ -79,7 +79,7 @@ - }; - - class ZipPackageFolder; --class ContentInfo; -+class ZipContentInfo; - - typedef std::hash_map < rtl::OUString, - ZipPackageFolder *, -@@ -87,7 +87,7 @@ - eqFunc > FolderHash; - - typedef std::hash_map < rtl::OUString, -- vos::ORef < ContentInfo >, -+ vos::ORef < ZipContentInfo >, - ::rtl::OUStringHash, - eqFunc > ContentHash; - diff --git a/editors/openoffice-3-devel/files/patch-package::inc::ZipPackageFolder.hxx b/editors/openoffice-3-devel/files/patch-package::inc::ZipPackageFolder.hxx deleted file mode 100644 index 014c61403380..000000000000 --- a/editors/openoffice-3-devel/files/patch-package::inc::ZipPackageFolder.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../package/inc/ZipPackageFolder.hxx.orig Thu Nov 15 21:01:49 2001 -+++ ../package/inc/ZipPackageFolder.hxx Wed Jun 12 23:10:42 2002 -@@ -106,7 +106,7 @@ - - void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); -- ContentInfo & doGetByName( const ::rtl::OUString& aName ) -+ ZipContentInfo & doGetByName( const ::rtl::OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource); - static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId() diff --git a/editors/openoffice-3-devel/files/patch-package::source::zippackage::ContentInfo.hxx b/editors/openoffice-3-devel/files/patch-package::source::zippackage::ContentInfo.hxx deleted file mode 100644 index c4bf35e79f64..000000000000 --- a/editors/openoffice-3-devel/files/patch-package::source::zippackage::ContentInfo.hxx +++ /dev/null @@ -1,34 +0,0 @@ ---- ../package/source/zippackage/ContentInfo.hxx.orig Tue Oct 30 14:54:47 2001 -+++ ../package/source/zippackage/ContentInfo.hxx Wed Jun 12 23:10:42 2002 -@@ -75,7 +75,7 @@ - #endif - #include <hash_map> - --class ContentInfo : public cppu::OWeakObject -+class ZipContentInfo : public cppu::OWeakObject - { - public: - com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel; -@@ -85,19 +85,19 @@ - ZipPackageFolder *pFolder; - ZipPackageStream *pStream; - }; -- ContentInfo ( ZipPackageStream * pNewStream ) -+ ZipContentInfo ( ZipPackageStream * pNewStream ) - : bFolder ( false ) - , pStream ( pNewStream ) - , xTunnel ( pNewStream ) - { - } -- ContentInfo ( ZipPackageFolder * pNewFolder ) -+ ZipContentInfo ( ZipPackageFolder * pNewFolder ) - : bFolder ( true ) - , pFolder ( pNewFolder ) - , xTunnel ( pNewFolder ) - { - } -- virtual ~ContentInfo () -+ virtual ~ZipContentInfo () - { - if ( bFolder ) - pFolder->releaseUpwardRef(); diff --git a/editors/openoffice-3-devel/files/patch-package::source::zippackage::ZipPackageFolder.cxx b/editors/openoffice-3-devel/files/patch-package::source::zippackage::ZipPackageFolder.cxx deleted file mode 100644 index bb504c834eef..000000000000 --- a/editors/openoffice-3-devel/files/patch-package::source::zippackage::ZipPackageFolder.cxx +++ /dev/null @@ -1,41 +0,0 @@ ---- ../package/source/zippackage/ZipPackageFolder.cxx.orig Wed Jun 12 23:09:16 2002 -+++ ../package/source/zippackage/ZipPackageFolder.cxx Wed Jun 12 23:10:42 2002 -@@ -212,7 +212,7 @@ - return maContents.size() > 0; - } - // XNameAccess --ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) -+ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) - { - ContentHash::iterator aIter = maContents.find ( aName ); -@@ -286,7 +286,7 @@ - aCI++) - { - const OUString &rShortName = (*aCI).first; -- const ContentInfo &rInfo = *(*aCI).second; -+ const ZipContentInfo &rInfo = *(*aCI).second; - - Sequence < PropertyValue > aPropSet (2); - PropertyValue *pValue = aPropSet.getArray(); -@@ -533,7 +533,7 @@ - aCI!=maContents.end(); - aCI++) - { -- ContentInfo &rInfo = * (*aCI).second; -+ ZipContentInfo &rInfo = * (*aCI).second; - if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () ) - rInfo.pFolder->releaseUpwardRef(); - else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() ) -@@ -577,9 +577,9 @@ - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) - { - if ( pEntry->IsFolder() ) -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); - else -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); - - if ( bSetParent ) - pEntry->setParent ( *this ); diff --git a/editors/openoffice-3-devel/files/patch-product::inc::scp::udk_basefiles.scp b/editors/openoffice-3-devel/files/patch-product::inc::scp::udk_basefiles.scp deleted file mode 100644 index 7b55cc064156..000000000000 --- a/editors/openoffice-3-devel/files/patch-product::inc::scp::udk_basefiles.scp +++ /dev/null @@ -1,18 +0,0 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 -+++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 -@@ -2,6 +2,7 @@ - - // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment - // (setup is linked against it). -+#if ( defined ( LINUX )) - #if ( defined( _gcc3 ) && defined( C300 ) ) - - File gid_File_Lib_gcc -@@ -42,6 +43,7 @@ - Name = STRING(libstdc++.so.3); - Styles = (NETWORK,RELATIVE); - End -+#endif - #endif - #endif - diff --git a/editors/openoffice-3-devel/files/patch-product::settings::settings.mk b/editors/openoffice-3-devel/files/patch-product::settings::settings.mk deleted file mode 100644 index 9773406f4ed2..000000000000 --- a/editors/openoffice-3-devel/files/patch-product::settings::settings.mk +++ /dev/null @@ -1,26 +0,0 @@ ---- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002 -+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002 -@@ -83,9 +83,8 @@ - - OS=SOLARIS - PS=/ --CC=CC --LINK=CC --LIB=CC -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat -@@ -136,9 +135,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat diff --git a/editors/openoffice-3-devel/files/patch-product::util::makefile.mk b/editors/openoffice-3-devel/files/patch-product::util::makefile.mk deleted file mode 100644 index d09ce5c7f40a..000000000000 --- a/editors/openoffice-3-devel/files/patch-product::util::makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../product/util/makefile.mk.orig Wed Oct 2 21:24:25 2002 -+++ ../product/util/makefile.mk Wed Oct 16 00:02:13 2002 -@@ -521,7 +521,7 @@ - - $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ - #------------------------------------------------------------- - - $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice-3-devel/files/patch-psprint::source::printer::printerinfomanager.cxx b/editors/openoffice-3-devel/files/patch-psprint::source::printer::printerinfomanager.cxx deleted file mode 100644 index 0880976d0815..000000000000 --- a/editors/openoffice-3-devel/files/patch-psprint::source::printer::printerinfomanager.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../psprint/source/printer/printerinfomanager.cxx.orig Wed Oct 16 00:02:09 2002 -+++ ../psprint/source/printer/printerinfomanager.cxx Fri Oct 18 20:02:54 2002 -@@ -883,7 +883,7 @@ - - static const struct SystemCommandParameters aParms[] = - { --#ifdef LINUX -+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) - { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 }, - { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 }, - { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1 } diff --git a/editors/openoffice-3-devel/files/patch-psprint::source::printergfx::printerjob.cxx b/editors/openoffice-3-devel/files/patch-psprint::source::printergfx::printerjob.cxx deleted file mode 100644 index 751ef978850f..000000000000 --- a/editors/openoffice-3-devel/files/patch-psprint::source::printergfx::printerjob.cxx +++ /dev/null @@ -1,15 +0,0 @@ ---- ../psprint/source/printergfx/printerjob.cxx.orig Sat Oct 19 14:49:13 2002 -+++ ../psprint/source/printergfx/printerjob.cxx Sat Oct 19 14:49:18 2002 -@@ -285,8 +285,12 @@ - - sal_Bool bSuccess = sal_False; - -+#ifdef FREEBSD -+ pPWEntry = getpwuid( getuid()); -+#else - if (getpwuid_r(getuid(), &aPWEntry, pPWBuffer, sizeof(pPWBuffer), &pPWEntry) != 0) - pPWEntry = NULL; -+#endif - - if (pPWEntry != NULL && pPWEntry->pw_name != NULL) - { diff --git a/editors/openoffice-3-devel/files/patch-psprint::source::printergfx::psheader.ps b/editors/openoffice-3-devel/files/patch-psprint::source::printergfx::psheader.ps deleted file mode 100644 index 2118d0fe6c93..000000000000 --- a/editors/openoffice-3-devel/files/patch-psprint::source::printergfx::psheader.ps +++ /dev/null @@ -1,13 +0,0 @@ ---- ../psprint/source/printergfx/psheader.ps.orig Tue Jun 4 22:33:58 2002 -+++ ../psprint/source/printergfx/psheader.ps -@@ -303,8 +303,8 @@ - /h /i /j /k /l /m /n /o - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /unused -- /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -- /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused -+ /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -+ /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /Zcaron /unused - /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis - /space /exclamdown /cent /sterling /currency /yen /brokenbar /section diff --git a/editors/openoffice-3-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice-3-devel/files/patch-registry::source::regkey.cxx deleted file mode 100644 index fad069f83f14..000000000000 --- a/editors/openoffice-3-devel/files/patch-registry::source::regkey.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../registry/source/regkey.cxx.orig Mon Mar 11 01:27:56 2002 -+++ ../registry/source/regkey.cxx Mon Mar 11 01:28:51 2002 -@@ -228,6 +228,9 @@ - { - RegError _ret = REG_NO_ERROR; - -+ if (!nSubKeys) -+ return REG_NO_ERROR; -+ - if (phSubKeys) - { - ORegistry* pReg = NULL; diff --git a/editors/openoffice-3-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk b/editors/openoffice-3-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk deleted file mode 100644 index 72e5a97234f4..000000000000 --- a/editors/openoffice-3-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../remotebridges/source/unourl_resolver/makefile.mk.orig Tue Jan 1 14:11:01 2002 -+++ ../remotebridges/source/unourl_resolver/makefile.mk -@@ -102,9 +102,9 @@ - SHL1VERSIONMAP= $(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-rsc::source::rscpp::cpp.h b/editors/openoffice-3-devel/files/patch-rsc::source::rscpp::cpp.h deleted file mode 100644 index 417ab33ba52f..000000000000 --- a/editors/openoffice-3-devel/files/patch-rsc::source::rscpp::cpp.h +++ /dev/null @@ -1,12 +0,0 @@ ---- ../rsc/source/rscpp/cpp.h.orig Fri Mar 1 00:14:38 2002 -+++ ../rsc/source/rscpp/cpp.h Fri Mar 1 00:15:03 2002 -@@ -462,7 +462,9 @@ - extern char *strrchr(); - extern char *strchr(); - #if ! ( defined UNX && defined ALPHA ) -+#if ! ( defined FREEBSD ) - extern long time(); -+#endif - #endif - /* extern char *sprintf(); */ /* Lint needs this */ - diff --git a/editors/openoffice-3-devel/files/patch-rsc::source::rscpp::cpp3.c b/editors/openoffice-3-devel/files/patch-rsc::source::rscpp::cpp3.c deleted file mode 100644 index f74de7504d2e..000000000000 --- a/editors/openoffice-3-devel/files/patch-rsc::source::rscpp::cpp3.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../rsc/source/rscpp/cpp3.c.orig Thu Jul 25 00:00:25 2002 -+++ ../rsc/source/rscpp/cpp3.c Thu Jul 25 00:01:50 2002 -@@ -82,7 +82,9 @@ - #ifdef IRIX - extern void abort(void); - #else -+#ifndef FREEBSD - extern int abort(); /* For debugging */ -+#endif - #endif - #endif - diff --git a/editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch deleted file mode 100644 index 6a320b4dac59..000000000000 --- a/editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sablot/Sablot-0.52.patch.orig Mon Aug 19 17:09:12 2002 -+++ ../sablot/Sablot-0.52.patch Fri Oct 18 21:28:48 2002 -@@ -97,7 +97,7 @@ - ! .IF "$(OS)"=="NETBSD" - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE - ! .ELSE --! .IF "$(OS)"=="MACOSX" -+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" - ! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE - ! .ELSE - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE diff --git a/editors/openoffice-3-devel/files/patch-sal::osl::unx::interlck.c b/editors/openoffice-3-devel/files/patch-sal::osl::unx::interlck.c deleted file mode 100644 index 60ea1f414d1a..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::osl::unx::interlck.c +++ /dev/null @@ -1,30 +0,0 @@ ---- ../sal/osl/unx/interlck.c.orig Mon Jul 22 17:51:34 2002 -+++ ../sal/osl/unx/interlck.c Mon Jul 22 18:03:42 2002 -@@ -81,10 +81,10 @@ - __asm__ __volatile__ ( - "movl $1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "incl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - -@@ -95,10 +95,10 @@ - __asm__ __volatile__ ( - "movl $-1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "decl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - diff --git a/editors/openoffice-3-devel/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice-3-devel/files/patch-sal::osl::unx::nlsupport.c deleted file mode 100644 index f82943872ab0..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::osl::unx::nlsupport.c +++ /dev/null @@ -1,131 +0,0 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Apr 10 18:11:58 2002 -+++ ../sal/osl/unx/nlsupport.c Fri Oct 18 23:31:19 2002 -@@ -63,7 +63,7 @@ - #include <osl/diagnose.h> - #include <osl/process.h> - --#if defined(LINUX) || defined(SOLARIS) -+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(IRIX) - #include <pthread.h> - #include <locale.h> - #include <langinfo.h> -@@ -114,8 +114,7 @@ - comparison = _pair_compare( key, base + current ); - if (comparison < 0) - upper = current; -- else -- if (comparison > 0) -+ else if (comparison > 0) - lower = current + 1; - else - return base + current; -@@ -241,12 +240,13 @@ - return NULL; - } - --#if defined(LINUX) || defined(SOLARIS) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD) - - /* - * This implementation of osl_getTextEncodingFromLocale maps - * from nl_langinfo(CODESET) to rtl_textencoding defines. -- * nl_langinfo() is supported only on Linux and Solaris. -+ * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.6 and >= FreeBSD 4.4 - * - * This routine is SLOW because of the setlocale call, so - * grab the result and cache it. -@@ -260,6 +260,12 @@ - #endif - #endif - -+/* -+ * _nl_language_list[] is an array list of supported encodings. Because -+ * we are using a binary search, the list has to be in ascending order. -+ * We are comparing the encodings case insensitiv, so the list has -+ * to be completly upper- , or lowercase. -+ */ - - #if defined(SOLARIS) - -@@ -478,7 +484,79 @@ - { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ - }; - --#endif /* ifdef LINUX */ -+#elif defined(IRIX) -+ -+const _pair _nl_language_list[] = { -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */ -+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */ -+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */ -+ }; -+ -+#elif defined(FREEBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+ }; -+ -+#elif defined(NETBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */ -+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+}; -+ -+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */ -+ - - static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; - diff --git a/editors/openoffice-3-devel/files/patch-sal::osl::unx::pipe.c b/editors/openoffice-3-devel/files/patch-sal::osl::unx::pipe.c deleted file mode 100644 index 4aa7b8af1a61..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::osl::unx::pipe.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ../sal/osl/unx/pipe.c.orig Thu Jul 11 16:01:39 2002 -+++ ../sal/osl/unx/pipe.c Fri Oct 18 19:56:38 2002 -@@ -264,7 +264,11 @@ - - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, name, sizeof(addr.sun_path)); -+#if defined(FREEBSD) -+ len = SUN_LEN(&addr); -+#else - len = sizeof(addr); -+#endif - - if ( Options & osl_Pipe_CREATE ) - { diff --git a/editors/openoffice-3-devel/files/patch-sal::osl::unx::security.c b/editors/openoffice-3-devel/files/patch-sal::osl::unx::security.c deleted file mode 100644 index 0cc321dcd544..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::osl::unx::security.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sal/osl/unx/security.c.orig Sat Jul 20 22:53:31 2002 -+++ ../sal/osl/unx/security.c Sat Jul 20 22:52:39 2002 -@@ -739,7 +739,7 @@ - } - - --#elif (LINUX && (GLIBC >= 2)) -+#elif ((LINUX && (GLIBC >= 2)) || defined(FREEBSD)) - - struct passwd *pPasswd; - diff --git a/editors/openoffice-3-devel/files/patch-sal::osl::unx::socket.c b/editors/openoffice-3-devel/files/patch-sal::osl::unx::socket.c deleted file mode 100644 index 9541cac8583f..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::osl::unx::socket.c +++ /dev/null @@ -1,26 +0,0 @@ ---- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 -+++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 -@@ -82,12 +82,12 @@ - #undef HAVE_POLL_H - #endif - --#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) - #include <sys/poll.h> - #define HAVE_POLL_H - #endif /* HAVE_POLL_H */ - --#if defined(SOLARIS) || defined ( FREEBSD ) -+#if defined(SOLARIS) - #include <poll.h> - #define HAVE_POLL_H - #endif /* SOLARIS */ -@@ -1965,7 +1965,7 @@ - /*****************************************************************************/ - oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) - { --#ifdef LINUX -+#ifdef LINUX || defined(FREEBSD) - socklen_t AddrLen; - #else - /* mfe: Solaris 'cc +w' means Addrlen should be signed! */ diff --git a/editors/openoffice-3-devel/files/patch-sal::osl::unx::system.c b/editors/openoffice-3-devel/files/patch-sal::osl::unx::system.c deleted file mode 100644 index 8dc663ac03fc..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::osl::unx::system.c +++ /dev/null @@ -1,127 +0,0 @@ ---- ../sal/osl/unx/system.c.orig Sun Mar 17 12:34:13 2002 -+++ ../sal/osl/unx/system.c Wed Apr 3 01:03:36 2002 -@@ -195,6 +195,73 @@ - } - #endif - -+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, -+ size_t buflen, struct passwd **result) -+{ -+ struct passwd* res; -+ -+ pthread_mutex_lock(&getrtl_mutex); -+ -+ if ( res = getpwuid(uid) ) -+ { -+ size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell; -+ -+ pw_name = strlen(res->pw_name)+1; -+ pw_passwd = strlen(res->pw_passwd)+1; -+ pw_class = strlen(res->pw_class)+1; -+ pw_gecos = strlen(res->pw_gecos)+1; -+ pw_dir = strlen(res->pw_dir)+1; -+ pw_shell = strlen(res->pw_shell)+1; -+ -+ if (pw_name+pw_passwd+pw_class+pw_gecos -+ +pw_dir+pw_shell < buflen) -+ { -+ memcpy(pwd, res, sizeof(struct passwd)); -+ -+ strncpy(buffer, res->pw_name, pw_name); -+ pwd->pw_name = buffer; -+ buffer += pw_name; -+ -+ strncpy(buffer, res->pw_passwd, pw_passwd); -+ pwd->pw_passwd = buffer; -+ buffer += pw_passwd; -+ -+ strncpy(buffer, res->pw_class, pw_class); -+ pwd->pw_class = buffer; -+ buffer += pw_class; -+ -+ strncpy(buffer, res->pw_gecos, pw_gecos); -+ pwd->pw_gecos = buffer; -+ buffer += pw_gecos; -+ -+ strncpy(buffer, res->pw_dir, pw_dir); -+ pwd->pw_dir = buffer; -+ buffer += pw_dir; -+ -+ strncpy(buffer, res->pw_shell, pw_shell); -+ pwd->pw_shell = buffer; -+ buffer += pw_shell; -+ -+ *result = pwd ; -+ res = 0 ; -+ -+ } else { -+ -+ res = ENOMEM ; -+ -+ } -+ -+ } else { -+ -+ res = errno ; -+ -+ } -+ -+ pthread_mutex_unlock(&getrtl_mutex); -+ -+ return res; -+} -+ - struct tm *localtime_r(const time_t *timep, struct tm *buffer) - { - struct tm* res; -@@ -518,3 +585,50 @@ - } - #endif - -+#if defined(NETBSD) || defined(FREEBSD) -+char *fcvt(double value, int ndigit, int *decpt, int *sign) -+{ -+ static char ret[256]; -+ char buf[256],zahl[256],format[256]="%"; -+ char *v1,*v2; -+ -+ if (value==0.0) value=1e-30; -+ -+ if (value<0.0) *sign=1; else *sign=0; -+ -+ if (value<1.0) -+ { -+ *decpt=(int)log10(value); -+ value*=pow(10.0,1-*decpt); -+ ndigit+=*decpt-1; -+ if (ndigit<0) ndigit=0; -+ } -+ else -+ { -+ *decpt=(int)log10(value)+1; -+ } -+ -+ sprintf(zahl,"%d",ndigit); -+ strcat(format,zahl); -+ strcat(format,"."); -+ strcat(format,zahl); -+ strcat(format,"f"); -+ -+ sprintf(buf,format,value); -+ -+ if (ndigit!=0) -+ { -+ v1=strtok(buf,"."); -+ v2=strtok(NULL,"."); -+ strcpy(ret,v1); -+ strcat(ret,v2); -+ } -+ else -+ { -+ strcpy(ret,buf); -+ } -+ -+ return(ret); -+} -+ -+#endif diff --git a/editors/openoffice-3-devel/files/patch-sal::osl::unx::system.h b/editors/openoffice-3-devel/files/patch-sal::osl::unx::system.h deleted file mode 100644 index d75cac79f29e..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::osl::unx::system.h +++ /dev/null @@ -1,17 +0,0 @@ ---- ../sal/osl/unx/system.h.orig Mon Mar 11 01:41:13 2002 -+++ ../sal/osl/unx/system.h Mon Mar 11 01:41:25 2002 -@@ -216,12 +216,9 @@ - # elif BYTE_ORDER == PDP_ENDIAN - # define _PDP_ENDIAN - # endif --# define sched_yield() pthread_yield() --# define pthread_testcancel() - # define NO_PTHREAD_RTL --# define NO_PTHREAD_PRIORITY --# define CMD_ARG_PRG __progname --# define CMD_ARG_ENV environ -+# define CMD_ARG_PROC_STREAM -+# define CMD_ARG_PROC_NAME "/proc/%u/cmdline" - #endif - - #ifdef SCO diff --git a/editors/openoffice-3-devel/files/patch-sal::textenc::tencinfo.c b/editors/openoffice-3-devel/files/patch-sal::textenc::tencinfo.c deleted file mode 100644 index 7cf80c18d0a0..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::textenc::tencinfo.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 -+++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 -@@ -695,6 +695,10 @@ - /* characters. The function search for the first equal string in */ - /* the table. In this table are only the most used mime types. */ - /* Sort order: important */ -+ -+ if (pMimeCharset == NULL) -+ pMimeCharset = "usascii"; -+ - static ImplStrCharsetDef const aVIPMimeCharsetTab[] = - { - { "usascii", RTL_TEXTENCODING_ASCII_US }, diff --git a/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk deleted file mode 100644 index 369935e31d66..000000000000 --- a/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk +++ /dev/null @@ -1,29 +0,0 @@ ---- ../sal/workben/makefile.mk.orig Tue May 15 14:11:20 2001 -+++ ../sal/workben/makefile.mk Sun Mar 10 23:46:59 2002 -@@ -113,7 +113,7 @@ - - .IF "$(TESTAPP)" == "salstattest" - -- CFLAGS+= /DUSE_SAL_STATIC -+ CFLAGS+= -DUSE_SAL_STATIC - - OBJFILES= $(OBJ)$/salstattest.obj - -@@ -325,7 +325,7 @@ - # tgetpwnam - # - .IF "$(TESTAPP)" == "tgetpwnam" --.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" -+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - - CXXFILES= tgetpwnam.cxx - OBJFILES= $(OBJ)$/tgetpwnam.obj -@@ -335,7 +335,7 @@ - APP5STDLIBS=$(SALLIB) - APP5DEPN= $(SLB)$/sal.lib - --.ENDIF # (sco | netbsd) -+.ENDIF # (sco | netbsd | freebsd) - .ENDIF # tgetpwname - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice-3-devel/files/patch-salhelper::source::gcc2_freebsd_intel.map b/editors/openoffice-3-devel/files/patch-salhelper::source::gcc2_freebsd_intel.map deleted file mode 100644 index 1ffacf889bc6..000000000000 --- a/editors/openoffice-3-devel/files/patch-salhelper::source::gcc2_freebsd_intel.map +++ /dev/null @@ -1,31 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:24 2002 -+++ ../salhelper/source/gcc2_freebsd_intel.map Thu Jun 6 20:02:18 2002 -@@ -0,0 +1,28 @@ -+SALHLP_1_0 { -+global: -+GetVersionInfo; -+_._Q28salhelper18ORealDynamicLoader; -+__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2PvT4; -+__tfQ29salhelper18ORealDynamicLoader; -+__tiQ29salhelper18ORealDynamicLoader; -+__vt_Q29salhelper18ORealDynamicLoader; -+_fini; -+_init; -+acquire__Q29salhelper18ORealDynamicLoader; -+getApi__CQ29salhelper18ORealDynamicLoader; -+newInstance__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2; -+release__Q29salhelper18ORealDynamicLoader; -+_._Q29salhelper21SimpleReferenceObject; -+__Q29salhelper21SimpleReferenceObject; -+__dl__Q29salhelper21SimpleReferenceObjectPv; -+__dl__Q29salhelper21SimpleReferenceObjectPvRC9nothrow_t; -+__nw__Q29salhelper21SimpleReferenceObjectUi; -+__nw__Q29salhelper21SimpleReferenceObjectUiRC9nothrow_t; -+__tfQ29salhelper21SimpleReferenceObject; -+__tiQ29salhelper21SimpleReferenceObject; -+__vt_Q29salhelper21SimpleReferenceObject; -+acquire__Q29salhelper21SimpleReferenceObject; -+release__Q29salhelper21SimpleReferenceObject; -+local: -+*; -+}; diff --git a/editors/openoffice-3-devel/files/patch-salhelper::source::gcc3_freebsd_intel.map b/editors/openoffice-3-devel/files/patch-salhelper::source::gcc3_freebsd_intel.map deleted file mode 100644 index 823cff316ec7..000000000000 --- a/editors/openoffice-3-devel/files/patch-salhelper::source::gcc3_freebsd_intel.map +++ /dev/null @@ -1,34 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:34 2002 -+++ ../salhelper/source/gcc3_freebsd_intel.map Thu Jun 6 20:02:29 2002 -@@ -0,0 +1,31 @@ -+UDK_3_0_0 { -+ global: -+GetVersionInfo; -+_DYNAMIC; -+_GLOBAL_OFFSET_TABLE_; -+_ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_; -+_ZN9salhelper18ORealDynamicLoader7acquireEv; -+_ZN9salhelper18ORealDynamicLoader7releaseEv; -+_ZN9salhelper18ORealDynamicLoaderC1EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderC2EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderD0Ev; -+_ZN9salhelper18ORealDynamicLoaderD1Ev; -+_ZN9salhelper18ORealDynamicLoaderD2Ev; -+_ZN9salhelper21SimpleReferenceObjectD0Ev; -+_ZN9salhelper21SimpleReferenceObjectD1Ev; -+_ZN9salhelper21SimpleReferenceObjectD2Ev; -+_ZN9salhelper21SimpleReferenceObjectdlEPv; -+_ZN9salhelper21SimpleReferenceObjectnwEj; -+_ZNK9salhelper18ORealDynamicLoader6getApiEv; -+_ZTVN9salhelper18ORealDynamicLoaderE; -+_ZTVN9salhelper21SimpleReferenceObjectE; -+__bss_start; -+_edata; -+_end; -+_fini; -+_init; -+component_getDescriptionFunc; -+ local: -+ *; -+}; -+ diff --git a/editors/openoffice-3-devel/files/patch-salhelper::source::makefile.mk b/editors/openoffice-3-devel/files/patch-salhelper::source::makefile.mk deleted file mode 100644 index 3687664d8d16..000000000000 --- a/editors/openoffice-3-devel/files/patch-salhelper::source::makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001 -+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002 -@@ -109,6 +109,10 @@ - SHL1VERSIONMAP=lngi.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+SHL1VERSIONMAP=gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+SHL1VERSIONMAP=gcc3_freebsd_intel.map - .ENDIF - - diff --git a/editors/openoffice-3-devel/files/patch-salhelper::test::rtti::makefile.mk b/editors/openoffice-3-devel/files/patch-salhelper::test::rtti::makefile.mk deleted file mode 100644 index 70f25048a24a..000000000000 --- a/editors/openoffice-3-devel/files/patch-salhelper::test::rtti::makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../salhelper/test/rtti/makefile.mk.orig Sat Jul 20 23:11:56 2002 -+++ ../salhelper/test/rtti/makefile.mk Sat Jul 20 23:12:01 2002 -@@ -116,6 +116,10 @@ - SHL1VERSIONMAP= sols.map - .ELIF "$(OS)$(CPU)"=="LINUXI" - SHL1VERSIONMAP= lngi.map -+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2" -+SHL1VERSIONMAP= gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" -+SHL1VERSIONMAP= gcc3_freebsd_intel.map - .ENDIF - - diff --git a/editors/openoffice-3-devel/files/patch-sc::source::core::data::cell.cxx b/editors/openoffice-3-devel/files/patch-sc::source::core::data::cell.cxx deleted file mode 100644 index 529f67a3e35f..000000000000 --- a/editors/openoffice-3-devel/files/patch-sc::source::core::data::cell.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sc/source/core/data/cell.cxx.orig Sun Jul 21 00:39:25 2002 -+++ ../sc/source/core/data/cell.cxx Sun Jul 21 00:39:26 2002 -@@ -75,7 +75,7 @@ - #include <mac_end.h> - #endif - --#ifdef SOLARIS -+#if defined (SOLARIS) || defined (FREEBSD) - #include <ieeefp.h> - #elif ( defined ( LINUX ) && ( GLIBC < 2 ) ) - #include <i386/ieeefp.h> diff --git a/editors/openoffice-3-devel/files/patch-scp::source::player::player.scp b/editors/openoffice-3-devel/files/patch-scp::source::player::player.scp deleted file mode 100644 index 2f8daab35cdd..000000000000 --- a/editors/openoffice-3-devel/files/patch-scp::source::player::player.scp +++ /dev/null @@ -1,20 +0,0 @@ ---- ../scp/source/player/player.scp.orig Sun Jul 21 00:30:27 2002 -+++ ../scp/source/player/player.scp Sun Jul 21 00:30:28 2002 -@@ -62,7 +62,7 @@ - // directories - //////////////////////// - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - - Directory GID_DIR_KDE2 - ParentID = PREDEFINED_HOMEDIR; -@@ -701,7 +701,7 @@ - Name = "gnomeappplayer.zip"; - End - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - - File GID_FILE_EXTRA_KDEAPPPLAYER - Dir = GID_DIR_KDE2_SHARE_APPLNK_STAR; diff --git a/editors/openoffice-3-devel/files/patch-scptools::source::linker::searchcache b/editors/openoffice-3-devel/files/patch-scptools::source::linker::searchcache deleted file mode 100644 index 593e9eabf5bc..000000000000 --- a/editors/openoffice-3-devel/files/patch-scptools::source::linker::searchcache +++ /dev/null @@ -1,34 +0,0 @@ -Index: files/patch-scptools::source::linker::searchcache -=================================================================== -RCS file: files/patch-scptools::source::linker::searchcache -diff -N files/patch-scptools::source::linker::searchcache ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ files/patch-scptools::source::linker::searchcache 4 Aug 2002 15:28:04 -0000 -@@ -0,0 +1,27 @@ -+--- ../scptools/source/linker/searchcache.hxx.orig Fri Aug 2 22:53:46 2002 -++++ ../scptools/source/linker/searchcache.hxx Fri Aug 2 22:54:50 2002 -+@@ -72,11 +72,11 @@ -+ // types -+ /////////////////////////////////////////////////////////////////////////////// -+ -+-DECLARE_LIST( FileList, ByteString* ) -++DECLARE_LIST( SCacheFileList, ByteString* ) -+ struct Include -+ { -+ ByteString aBaseDir; -+- FileList aFileLst; -++ SCacheFileList aFileLst; -+ }; -+ DECLARE_LIST( IncludeList, Include* ) -+ -+--- ../scptools/source/linker/searchcache.cxx.orig Fri Aug 2 22:53:35 2002 -++++ ../scptools/source/linker/searchcache.cxx Fri Aug 2 22:55:14 2002 -+@@ -218,7 +218,7 @@ -+ rPath += aDelim; -+ } -+ -+-void ScanFileList( const ByteString& rPath, FileList& rLst ) -++void ScanFileList( const ByteString& rPath, SCacheFileList& rLst ) -+ { -+ Dir aFiles( rPath, FSYS_KIND_FILE ); -+ for( USHORT i = 0; i < aFiles.Count(); ++i ) diff --git a/editors/openoffice-3-devel/files/patch-scptools::source::linker::ziplst.cxx b/editors/openoffice-3-devel/files/patch-scptools::source::linker::ziplst.cxx deleted file mode 100644 index 83b84631542e..000000000000 --- a/editors/openoffice-3-devel/files/patch-scptools::source::linker::ziplst.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- ../scptools/source/linker/ziplst.cxx.orig Sun Jul 21 00:32:40 2002 -+++ ../scptools/source/linker/ziplst.cxx Sun Jul 21 00:32:43 2002 -@@ -278,6 +278,7 @@ - #define OS_SOLI "solia" - #define OS_WINDOWS "windows" - #define OS_LINUX "linux" -+#define OS_FREEBSD "freebsd" - #define OS_OS2 "os2" - - ByteString _OS2Alpha( const ByteString& rStr ) -@@ -290,6 +291,8 @@ - return OS_SOLI; - else if( rStr.CompareIgnoreCaseToAscii("unxlngi",7) == COMPARE_EQUAL ) - return OS_LINUX; -+ else if( rStr.CompareIgnoreCaseToAscii("unxfbsdi",7) == COMPARE_EQUAL ) -+ return OS_FREEBSD; - else if( rStr.CompareIgnoreCaseToAscii("os2icci",7) == COMPARE_EQUAL ) - return OS_OS2; - diff --git a/editors/openoffice-3-devel/files/patch-setup2::inc::fields.hxx b/editors/openoffice-3-devel/files/patch-setup2::inc::fields.hxx deleted file mode 100644 index d56e12f2abf4..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::inc::fields.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- ../setup2/inc/fields.hxx.orig Sun Jul 21 00:19:07 2002 -+++ ../setup2/inc/fields.hxx Sun Jul 21 00:19:12 2002 -@@ -104,6 +104,7 @@ - extern char const VALUE_YES_IF_HPUX_HP9000[]; - extern char const VALUE_YES_IF_AIX_RS6000[]; - extern char const VALUE_YES_IF_LINUX_X86[]; -+extern char const VALUE_YES_IF_FREEBSD_X86[]; - extern char const VALUE_KEEP_OLD_VERSION[]; - extern char const VALUE_NETWORK[]; - extern char const VALUE_NO[]; diff --git a/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::loader.c b/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::loader.c deleted file mode 100644 index a71f7b3f327c..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::loader.c +++ /dev/null @@ -1,17 +0,0 @@ ---- ../setup2/mow/source/loader/loader.c.orig Thu Dec 13 17:44:58 2001 -+++ ../setup2/mow/source/loader/loader.c Wed Apr 3 01:07:58 2002 -@@ -615,6 +615,14 @@ - " LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ -+" FreeBSD)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ -+" NetBSD)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ - " *)\n" \ - " ;;\n" \ - "esac\n" \ diff --git a/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::makefile.mk b/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::makefile.mk deleted file mode 100644 index 007c0f69b6f9..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002 -+++ ../setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002 -@@ -85,7 +85,7 @@ - APP1NOSAL=TRUE - APP1TARGET= $(TARGET) - APP1OBJS= $(OBJFILES) --APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11 - - .ENDIF # "$(OS)"=="MACOSX" - diff --git a/editors/openoffice-3-devel/files/patch-setup2::patch::makefile.mk b/editors/openoffice-3-devel/files/patch-setup2::patch::makefile.mk deleted file mode 100644 index 53846a8bdfc9..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::patch::makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../setup2/patch/makefile.mk.orig Sun Jul 21 00:21:46 2002 -+++ ../setup2/patch/makefile.mk Sun Jul 21 00:21:52 2002 -@@ -92,7 +92,7 @@ - .IF "$(OS)"=="SOLARIS" - STATIC_LIBS+= -Bdynamic -lnsl -lsocket -lposix4 - .ENDIF --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - STATIC_LIBS+= -Bdynamic -lcrypt - .ENDIF - .ELSE diff --git a/editors/openoffice-3-devel/files/patch-setup2::script::setupserver b/editors/openoffice-3-devel/files/patch-setup2::script::setupserver deleted file mode 100644 index 450ea386c841..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::script::setupserver +++ /dev/null @@ -1,10 +0,0 @@ ---- ../setup2/script/setupserver.orig Fri Nov 17 12:29:29 2000 -+++ ../setup2/script/setupserver Fri Oct 18 23:47:09 2002 -@@ -234,6 +234,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-3-devel/files/patch-setup2::source::compiler::decltor.cxx b/editors/openoffice-3-devel/files/patch-setup2::source::compiler::decltor.cxx deleted file mode 100644 index 98f6ad2f7567..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::source::compiler::decltor.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../setup2/source/compiler/decltor.cxx.orig Sun Jul 21 00:25:00 2002 -+++ ../setup2/source/compiler/decltor.cxx Sun Jul 21 00:24:06 2002 -@@ -304,6 +304,7 @@ - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLSG || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLIG || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_LINUX || -+ m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_FREEBSD || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_HP || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SCO; - } ---- ../setup2/source/compiler/fields.cxx.orig Sun Jul 21 00:25:42 2002 -+++ ../setup2/source/compiler/fields.cxx Sun Jul 21 00:25:45 2002 -@@ -105,6 +105,7 @@ - char const VALUE_YES_IF_HPUX_HP9000[] = "YES_IF_HPUX_HP9000"; - char const VALUE_YES_IF_AIX_RS6000[] = "YES_IF_AIX_RS6000"; - char const VALUE_YES_IF_LINUX_X86[] = "YES_IF_LINUX_X86"; -+char const VALUE_YES_IF_FREEBSD_X86[] = "YES_IF_FREEBSD_X86"; - char const VALUE_KEEP_OLD_VERSION[] = "KEEP_OLD_VERSION"; - char const VALUE_NETWORK[] = "NETWORK"; - char const VALUE_NO[] = "NO"; diff --git a/editors/openoffice-3-devel/files/patch-setup2::source::custom::jvmsetup::jvmdlg.cxx b/editors/openoffice-3-devel/files/patch-setup2::source::custom::jvmsetup::jvmdlg.cxx deleted file mode 100644 index ac0b39a6aa47..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::source::custom::jvmsetup::jvmdlg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002 -+++ ../setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002 -@@ -154,7 +154,7 @@ - - #if defined (OS2) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) ); --#elif defined (LINUX) -+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) ); - #elif defined (SOLARIS) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) ); diff --git a/editors/openoffice-3-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh b/editors/openoffice-3-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh deleted file mode 100644 index f199b18823e1..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Fri Jun 14 15:36:11 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Fri Oct 18 23:45:45 2002 -@@ -65,6 +65,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - diff --git a/editors/openoffice-3-devel/files/patch-setup2::source::service::interface.cxx b/editors/openoffice-3-devel/files/patch-setup2::source::service::interface.cxx deleted file mode 100644 index 8e478e17971d..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2::source::service::interface.cxx +++ /dev/null @@ -1,35 +0,0 @@ ---- ../setup2/source/service/interface.cxx.orig Sat Jul 20 23:29:33 2002 -+++ ../setup2/source/service/interface.cxx Sat Jul 20 23:30:02 2002 -@@ -126,6 +126,8 @@ - aExtension = "UNIX_SOLIG"; - else if( eType == OSType_UNIX_LINUX ) - aExtension = "UNIX_LINUX"; -+ else if( eType == OSType_UNIX_LINUX ) -+ aExtension = "UNIX_FREEBSD"; - else if( eType == OSType_UNIX_HP ) - aExtension = "UNIX_HP"; - else if( eType == OSType_UNIX_SCO ) -@@ -238,6 +240,7 @@ - readOSConfiguration( OSType_UNIX_SOLSG ); - readOSConfiguration( OSType_UNIX_SOLIG ); - readOSConfiguration( OSType_UNIX_LINUX ); -+ readOSConfiguration( OSType_UNIX_FREEBSD ); - readOSConfiguration( OSType_UNIX_HP ); - readOSConfiguration( OSType_UNIX_SCO ); - fprintf( stdout, "\n" ); -@@ -577,6 +580,7 @@ - case OSType_UNIX_SOLSG: - case OSType_UNIX_SOLIG: - case OSType_UNIX_LINUX: -+ case OSType_UNIX_FREEBSD: - case OSType_UNIX_HP: - case OSType_UNIX_SCO: - return ByteString(UNX_README_FILE_NAME); -@@ -599,6 +603,7 @@ - case OSType_UNIX_SOLSG: - case OSType_UNIX_SOLIG: - case OSType_UNIX_LINUX: -+ case OSType_UNIX_FREEBSD: - case OSType_UNIX_HP: - case OSType_UNIX_SCO: - return ByteString(UNX_LICENSE_FILE_NAME); diff --git a/editors/openoffice-3-devel/files/patch-sfx2::source::appl::officeacceptthread.cxx b/editors/openoffice-3-devel/files/patch-sfx2::source::appl::officeacceptthread.cxx deleted file mode 100644 index 154fcd10850b..000000000000 --- a/editors/openoffice-3-devel/files/patch-sfx2::source::appl::officeacceptthread.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sfx2/source/appl/officeacceptthread.cxx.orig Thu Oct 11 15:39:58 2001 -+++ ../sfx2/source/appl/officeacceptthread.cxx Fri Oct 18 23:35:14 2002 -@@ -126,7 +126,7 @@ - #if defined (SOLARIS) - int status; - nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); --#elif defined(LINUX) -+#elif defined(LINUX) || defined (FREEBSD) - nRet = kill(aProcessInfo.Ident, 0); - #endif - #if defined (UNX) diff --git a/editors/openoffice-3-devel/files/patch-shell::source::cmdmail::makefile.mk b/editors/openoffice-3-devel/files/patch-shell::source::cmdmail::makefile.mk deleted file mode 100644 index 0476285c802e..000000000000 --- a/editors/openoffice-3-devel/files/patch-shell::source::cmdmail::makefile.mk +++ /dev/null @@ -1,16 +0,0 @@ ---- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002 -+++ ../shell/source/cmdmail/makefile.mk -@@ -81,9 +81,10 @@ - - SHL1TARGET=$(TARGET) - --SHL1STDLIBS=$(CPPULIB)\ -- $(CPPUHELPERLIB)\ -- $(SALLIB) -+SHL1STDLIBS=\ -+ $(SALLIB)\ -+ $(CPPULIB)\ -+ $(CPPUHELPERLIB) - - SHL1LIBS= - diff --git a/editors/openoffice-3-devel/files/patch-shell::source::proxysettings::makefile.mk b/editors/openoffice-3-devel/files/patch-shell::source::proxysettings::makefile.mk deleted file mode 100644 index e83cf7c9d7a1..000000000000 --- a/editors/openoffice-3-devel/files/patch-shell::source::proxysettings::makefile.mk +++ /dev/null @@ -1,16 +0,0 @@ ---- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002 -+++ ../shell/source/proxysettings/makefile.mk -@@ -85,9 +85,10 @@ - - SHL1TARGET=$(TARGET) - --SHL1STDLIBS=$(CPPULIB)\ -- $(CPPUHELPERLIB)\ -- $(SALLIB) -+SHL1STDLIBS=\ -+ $(SALLIB)\ -+ $(CPPULIB)\ -+ $(CPPUHELPERLIB) - - SHL1LIBS= - diff --git a/editors/openoffice-3-devel/files/patch-shell::source::unix::exec::makefile.mk b/editors/openoffice-3-devel/files/patch-shell::source::unix::exec::makefile.mk deleted file mode 100644 index 0b7712ee35f8..000000000000 --- a/editors/openoffice-3-devel/files/patch-shell::source::unix::exec::makefile.mk +++ /dev/null @@ -1,16 +0,0 @@ ---- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002 -+++ ../shell/source/unix/exec/makefile.mk -@@ -79,9 +79,10 @@ - - SHL1TARGET=$(TARGET) - --SHL1STDLIBS=$(CPPULIB)\ -- $(CPPUHELPERLIB)\ -- $(SALLIB) -+SHL1STDLIBS=\ -+ $(SALLIB)\ -+ $(CPPULIB)\ -+ $(CPPUHELPERLIB) - - SHL1LIBS= - diff --git a/editors/openoffice-3-devel/files/patch-solenv::bin::addsym.awk b/editors/openoffice-3-devel/files/patch-solenv::bin::addsym.awk deleted file mode 100644 index d4b9daeb8a48..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::bin::addsym.awk +++ /dev/null @@ -1,10 +0,0 @@ ---- ../solenv/bin/addsym.awk.kan Sat Jul 27 10:10:19 2002 -+++ ../solenv/bin/addsym.awk Thu Jul 25 14:49:30 2002 -@@ -62,6 +62,7 @@ - BEGIN { global_found = "false" } - /[ \t]*local:/ { global_found = "false" } - global_found == "true" { -+ print "\t\tGetVersionInfo;" - print "\t\t_ZTS*;" - print "\t\t_ZTI*;" - global_found = "false" } diff --git a/editors/openoffice-3-devel/files/patch-solenv::bin::mapgen.pl b/editors/openoffice-3-devel/files/patch-solenv::bin::mapgen.pl deleted file mode 100644 index 71ebdb934120..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::bin::mapgen.pl +++ /dev/null @@ -1,21 +0,0 @@ ---- ../solenv/bin/mapgen.pl.orig Sat Jul 20 22:30:21 2002 -+++ ../solenv/bin/mapgen.pl Sat Jul 20 22:31:31 2002 -@@ -112,7 +112,7 @@ - - if ($ENV{OS} eq 'SOLARIS') { - &gen_sol; --} elsif ($ENV{OS} eq 'LINUX') { -+} elsif ($ENV{OS} eq 'LINUX' || $ENV{OS} eq 'FREEBSD') { - &gen_lnx; - } else { - &print_error ('Environment not set!!'); -@@ -169,7 +169,8 @@ - s/\n//; - $env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS')); - $env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX')); -- last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/))); -+ $env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD')); -+ last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/) || (/^# FREEBSD #$/))); - next if (!$_ || /^#/); - push(@filters, $_); - }; diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::_tg_shl.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::_tg_shl.mk deleted file mode 100644 index 518cb892bccb..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::_tg_shl.mk +++ /dev/null @@ -1,372 +0,0 @@ ---- ../solenv/inc/_tg_shl.mk.orig Fri Aug 16 13:27:02 2002 -+++ ../solenv/inc/_tg_shl.mk Sat Oct 19 10:46:46 2002 -@@ -219,7 +219,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -360,22 +360,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -681,7 +681,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -822,22 +822,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1143,7 +1143,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -1284,22 +1284,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1605,7 +1605,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -1746,22 +1746,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2067,7 +2067,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -2208,22 +2208,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2529,7 +2529,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -2670,22 +2670,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2991,7 +2991,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -3132,22 +3132,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3453,7 +3453,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -3594,22 +3594,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3915,7 +3915,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -4056,22 +4056,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -4377,7 +4377,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -4518,22 +4518,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::pstrules.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::pstrules.mk deleted file mode 100644 index ec490e2a96f1..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::pstrules.mk +++ /dev/null @@ -1,131 +0,0 @@ ---- ../solenv/inc/pstrules.mk.orig Thu Aug 29 17:01:48 2002 -+++ ../solenv/inc/pstrules.mk Sat Oct 19 10:49:28 2002 -@@ -80,15 +80,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -108,15 +108,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -142,11 +142,11 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& $(NULLDEV) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - - $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c -@@ -154,23 +154,23 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -190,11 +190,11 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& $(NULLDEV) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - - $(SLO)$/$(SECOND_BUILD)_%.obj : %.c -@@ -202,19 +202,19 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE - @+-$(RM) $@ >& $(NULLDEV) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c - .ELSE - +$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - .ENDIF - .ENDIF -@@ -236,7 +236,7 @@ - @echo Making: $@ - @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) - .IF "$(GUI)"=="OS2" -- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre - .ENDIF - .IF "$(GUI)"=="WNT" - cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::rules.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::rules.mk deleted file mode 100644 index 12d168766948..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::rules.mk +++ /dev/null @@ -1,212 +0,0 @@ ---- ../solenv/inc/rules.mk.orig Wed Aug 21 15:04:19 2002 -+++ ../solenv/inc/rules.mk Sat Oct 19 10:52:25 2002 -@@ -78,16 +78,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF - .ENDIF - -@@ -98,16 +98,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - .ENDIF - -@@ -122,17 +122,17 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE # "$(GUI)"=="UNX" - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF # "$(GUI)"=="UNX" - - $(SLO)$/%.obj : %.cpp -@@ -140,17 +140,17 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - - $(SLO)$/%.obj : $(MISC)$/%.cxx -@@ -158,16 +158,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : $(MISC)$/%.cxx -@@ -175,16 +175,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : %.c -@@ -192,20 +192,20 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c - .ELSE - +-@echo Cflags: $(CFLAGS) -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -215,13 +215,13 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - @+$(ECHONL) -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - $(SEMADEBUG) - .ENDIF - -@@ -230,16 +230,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - @+$(ECHONL) - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -249,14 +249,14 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+-$(RM) $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) - .ENDIF - .ENDIF - diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::settings.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::settings.mk deleted file mode 100644 index ea6a898a9a6d..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::settings.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002 -+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002 -@@ -166,7 +166,6 @@ - CDEFSOPT= - HDEFS= - --CC= - .IF "$(add_cflags)"!="" - ENVCFLAGS+=$(add_cflags) - .ENDIF -@@ -264,8 +263,6 @@ - AS= - BC= - COBOL= --CPP= --CXX= - FOR= - PASCAL= - diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk deleted file mode 100644 index 0c1b107de988..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk +++ /dev/null @@ -1,5 +0,0 @@ ---- /dev/null Mon Mar 11 14:55:01 2002 -+++ ../solenv/inc/startup/FREEBSD/macros.mk Mon Mar 11 14:54:59 2002 -@@ -0,0 +1,2 @@ -+ -+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk deleted file mode 100644 index 701692c9425a..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 -+++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 -@@ -81,7 +81,9 @@ - .ENDIF # "$(GUI)"=="WNT" - - .IF "$(OS)"!="NETBSD" -+.IF "$(OS)"!="FREEBSD" - PATCHFLAGS=-b -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)"=="NETBSD" - - #override diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::tg_moz.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::tg_moz.mk deleted file mode 100644 index 255a41f92281..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::tg_moz.mk +++ /dev/null @@ -1,17 +0,0 @@ ---- ../solenv/inc/tg_moz.mk.orig Sat Jul 20 23:57:37 2002 -+++ ../solenv/inc/tg_moz.mk Sat Jul 20 23:57:55 2002 -@@ -36,6 +36,14 @@ - CPUCFG=_linux.cfg - .ENDIF - -+.IF "$(OS)"=="FREEBSD" -+CPUCFG=_freebsd.cfg -+.ENDIF -+ -+.IF "$(OS)"=="NETBSD" -+CPUCFG=_netbsd.cfg -+.ENDIF -+ - .IF "$(GEN_PRCPUCFG)"!="" - $(GEN_PRCPUCFG): $(PRJ)$/pr$/include$/md$/$(CPUCFG) - @+$(COPY) $(PRJ)$/pr$/include$/md$/$(CPUCFG) $@ diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::tg_shl.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::tg_shl.mk deleted file mode 100644 index e7f61fcd90b8..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::tg_shl.mk +++ /dev/null @@ -1,39 +0,0 @@ ---- ../solenv/inc/tg_shl.mk.orig Fri Aug 16 13:26:42 2002 -+++ ../solenv/inc/tg_shl.mk Sat Oct 19 10:54:46 2002 -@@ -319,7 +319,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" -@@ -460,22 +460,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE -- $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF - .IF "$(OS)"=="IRIX" -- $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::unxfbsdi.mk deleted file mode 100644 index b189474e5f82..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::unxfbsdi.mk +++ /dev/null @@ -1,209 +0,0 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002 -@@ -1,84 +1,139 @@ -- - # mak file fuer unxfbsdi - --ASM= --AFLAGS= -+ASM=$(CC) -+AFLAGS=-x assembler-with-cpp -c $(CDEFS) - - SOLAR_JAVA=TRUE - JAVAFLAGSDEBUG=-g - -+# filter for supressing verbose messages from linker -+# not needed at the moment - LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - -+# options for C and C++ Compiler -+CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) -+CDEFS+=$(PTHREAD_CFLAGS) -+ -+# this is a platform with JAVA support -+.IF "$(SOLAR_JAVA)"!="" -+JAVADEF=-DSOLAR_JAVA -+.IF "$(debug)"=="" -+JAVA_RUNTIME=-ljava -+.ELSE -+JAVA_RUNTIME=-ljava_g -+.ENDIF -+.ENDIF -+ -+# flags for C and C++ Compiler -+CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include -+CFLAGS+=-I/usr/X11R6/include -+ -+# flags for the C++ Compiler -+CFLAGSCC=-pipe -+CFLAGSCXX=-pipe -fno-for-scope -fpermissive -+ -+# Flags for enabling exception handling -+CFLAGSEXCEPTIONS=-fexceptions -+ -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -+ -+# Compiler flags for compiling static object in single threaded -+# environment with graphical user interface -+CFLAGSOBJGUIST=-fPIC -+ -+# Compiler flags for compiling static object in single threaded -+# environment with character user interface -+CFLAGSOBJCUIST=-fPIC -+ -+# Compiler flags for compiling static object in multi threaded -+# environment with graphical user interface -+CFLAGSOBJGUIMT=-fPIC - --cc= gcc --CC= g++ --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 --CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE --CFLAGS+= -w -c $(INCLUDE) --CFLAGS+= -I/usr/X11R6/include --CFLAGSCC= -pipe --CFLAGSCXX= -pipe -fno-for-scope -fpermissive --CFLAGSEXCEPTIONS= -fexceptions --CFLAGS_NO_EXCEPTIONS= -fno-exceptions --CFLAGSOBJGUIST= -fPIC --CFLAGSOBJCUIST= -fPIC --CFLAGSOBJGUIMT= -fPIC --CFLAGSOBJCUIMT= -fPIC --CFLAGSSLOGUIMT= -fPIC --CFLAGSSLOCUIMT= -fPIC --CFLAGSPROF= -pg --CFLAGSDEBUG= -g -+# Compiler flags for compiling static object in multi threaded -+# environment with character user interface -+CFLAGSOBJCUIMT=-fPIC -+ -+# Compiler flags for compiling shared object in multi threaded -+# environment with graphical user interface -+CFLAGSSLOGUIMT=-fPIC -+ -+# Compiler flags for compiling shared object in multi threaded -+# environment with character user interface -+CFLAGSSLOCUIMT=-fPIC -+ -+# Compiler flags for profiling -+CFLAGSPROF=-pg -+ -+# Compiler flags for debugging -+CFLAGSDEBUG=-g -ggdb - CFLAGSDBGUTIL= --CFLAGSOPT= -O2 --CFLAGSNOOPT= -O --CFLAGSOUTOBJ= -o -- --STATIC= -Wl,-Bstatic --DYNAMIC= -Wl,-Bdynamic -- --#THREADLIB= -pthread --LINK= gcc --# -v -nostdlib -+ -+# Compiler flags to enable optimizations -+# -02 is broken for FreeBSD -+CFLAGSOPT=-O -+ -+# Compiler flags to disable optimizations -+# -0 is broken for STLport -+CFLAGSNOOPT=-O0 -+ -+# Compiler flags for the output path -+CFLAGSOUTOBJ=-o -+ -+# switches for dynamic and static linking -+STATIC=-Wl,-Bstatic -+DYNAMIC=-Wl,-Bdynamic -+ -+LINK=$(CXX) - LINKFLAGS= --LINKFLAGSAPPGUI= -Wl,-export-dynamic --LINKFLAGSAPPCUI= -Wl,-export-dynamic -+ -+# linker flags for linking applications -+LINKFLAGSAPPGUI= -+LINKFLAGSAPPCUI= -+ -+# linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared - LINKFLAGSSHLCUI= -shared - LINKFLAGSTACK= - LINKFLAGSPROF= - LINKFLAGSDEBUG=-g --LINKFLAGSOPT= -+LINKFLAGSOPT=-O - - .IF "$(NO_BSYMBOLIC)"=="" - .IF "$(PRJNAME)" != "envtest" --LINKFLAGSSHLGUI+= -Wl,-Bsymbolic --LINKFLAGSSHLCUI+= -Wl,-Bsymbolic -+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic - .ENDIF - .ENDIF - - LINKVERSIONMAPFLAG=-Wl,--version-script - -+# Sequence of libs does matter ! - STDLIBCPP=-lstdc++ - --# _SYSLIBS= -L/usr/lib -lm --# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 --# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+# libraries for linking applications -+STDLIBCUIST=-lm -+STDLIBGUIST=-lXaw -lXt -lX11 -lm -+STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc -+STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc -+ -+# libraries for linking shared libraries -+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc -+STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc -+ -+# STLport always needs pthread. -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS) -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) - -+# default objectfilenames to lin - STDOBJGUI= - STDSLOGUI= - STDOBJCUI= - STDSLOCUI= - --STDLIBCUIST=-lm --STDLIBGUIST=-lX11 -lm --STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc --STDLIBCUIMT=-pthread -lm -lstlport_gcc --STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc --STDSHLCUIMT=-pthread -lm -lstlport_gcc -- --LIBMGR= ar --LIBFLAGS= -r --LIBEXT= .a -+LIBMGR=ar -+LIBFLAGS=-r -+LIBEXT=.a - - IMPLIB= - IMPLIBFLAGS= -@@ -87,12 +142,12 @@ - MAPSYMFLAGS= - - RC=irc --RCFLAGS= -fo$@ $(RCFILES) -+RCFLAGS=-fo$@ $(RCFILES) - RCLINK= - RCLINKFLAGS= - RCSETVERSION= - --DLLPOSTFIX= fi --DLLPRE= lib --DLLPOST= .so --LDUMP= -+# platform specific identifier for shared libs -+DLLPOSTFIX=fi -+DLLPRE=lib -+DLLPOST=.so diff --git a/editors/openoffice-3-devel/files/patch-soltools::mkdepend::main.c b/editors/openoffice-3-devel/files/patch-soltools::mkdepend::main.c deleted file mode 100644 index cffd5cbb1f43..000000000000 --- a/editors/openoffice-3-devel/files/patch-soltools::mkdepend::main.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../soltools/mkdepend/main.c.orig Mon Apr 15 15:55:43 2002 -+++ ../soltools/mkdepend/main.c Mon Apr 15 16:54:06 2002 -@@ -27,6 +27,9 @@ - - */ - -+#include <sys/types.h> -+#include <sys/stat.h> -+ - #include "def.h" - #ifdef hpux - #define sigvec sigvector diff --git a/editors/openoffice-3-devel/files/patch-stlport::STLport-4.5.patch b/editors/openoffice-3-devel/files/patch-stlport::STLport-4.5.patch deleted file mode 100644 index 2a34de03f4b1..000000000000 --- a/editors/openoffice-3-devel/files/patch-stlport::STLport-4.5.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002 -+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002 -@@ -174,3 +174,110 @@ - class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { - public: - __Named_exception(const string& __str) -+--- misc/STLport-4.5/src/gcc-freebsd.mak Sun Jul 29 05:36:25 2001 -++++ misc/build/STLport-4.5/src/gcc-freebsd.mak Tue May 28 23:04:27 2002 -+@@ -5,8 +5,8 @@ -+ # -+ # compiler -+ # -+-CC = gcc -pthread -+-CXX = c++ -pthread -fexceptions -++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT -++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions -+ -+ # -+ # Basename for libraries -+@@ -19,7 +19,7 @@ -+ # -+ LINK=ar cr -+ # 2.95 flag -+-DYN_LINK=c++ -pthread -fexceptions -shared -o -++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o -+ -+ OBJEXT=o -+ DYNEXT=so -+@@ -41,8 +41,8 @@ -+ -+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -+ -+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC -++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} -++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC -+ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -+--- /dev/null Tue May 28 22:55:00 2002 -++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak Tue May 28 22:38:52 2002 -+@@ -0,0 +1,59 @@ -++# -++# Note : this makefile is for gcc-3 ! -++# -++ -++# -++# compiler -++# -++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT -++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions -++ -++# -++# Basename for libraries -++# -++LIB_BASENAME = libstlport_gcc -++ -++# -++# guts for common stuff -++# -++# -++LINK=ar cr -++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o -++ -++OBJEXT=o -++DYNEXT=so -++STEXT=a -++RM=rm -rf -++PATH_SEP=/ -++MKDIR=mkdir -p -++COMP=GCC-FREEBSD -++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 -++ -++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -++ -++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} -++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC -++ -++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -++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 -++ -++include common_percent_rules.mak -++include common_rules.mak -++ -++ -++#install: all -++# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib -++ -++#%.s: %.cpp -++# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ -++ -++ -+--- misc/STLport-4.5/stlport/cwchar.orig Tue May 28 22:51:31 2002 -++++ misc/build/STLport-4.5/stlport/cwchar Tue May 28 22:55:33 2002 -+@@ -21,6 +21,9 @@ -+ # include <stl/_prolog.h> -+ # endif -+ -++#ifdef __FreeBSD__ -++# include <../wchar.h> -++#endif -+ # include <stl/_cwchar.h> -+ -+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120) diff --git a/editors/openoffice-3-devel/files/patch-stlport::makefile.mk b/editors/openoffice-3-devel/files/patch-stlport::makefile.mk deleted file mode 100644 index 0cbbfcaf00a7..000000000000 --- a/editors/openoffice-3-devel/files/patch-stlport::makefile.mk +++ /dev/null @@ -1,29 +0,0 @@ ---- ../stlport/makefile.mk.orig Tue Aug 27 19:26:10 2002 -+++ ../stlport/makefile.mk Fri Oct 18 22:33:22 2002 -@@ -107,16 +107,26 @@ - - .IF "$(COM)"=="GCC" - .IF "$(COMID)"=="gcc3" -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-3.0-freebsd.mak -+.ELSE - BUILD_FLAGS=-f gcc-3.0.mak -+.ENDIF - .ELSE # "$(COMID)"=="gcc3" - # MacOS X/Darwin need a special makefile - .IF "$(OS)"=="MACOSX" - BUILD_FLAGS=-f gcc-apple-macosx.mak -+.ELIF "$(OS)"=="FREEBSD" -+ BUILD_FLAGS=-f gcc-freebsd.mak - .ELSE # "$(OS)"=="MACOSX" - BUILD_FLAGS=-f gcc.mak - .ENDIF # "$(OS)"=="MACOSX" - .ENDIF # "$(COMID)"=="gcc3" -+.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=gmake -+.ELSE - BUILD_ACTION=make -+.ENDIF - .ENDIF - - .IF "$(COM)"=="C52" diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::corereflection::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::corereflection::makefile.mk deleted file mode 100644 index 4b319b08d401..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::corereflection::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/corereflection/makefile.mk -@@ -87,9 +87,9 @@ - SHL1TARGET= $(TARGET) - SHL1VERSIONMAP= $(TARGET).map - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::defaultregistry::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::defaultregistry::makefile.mk deleted file mode 100644 index 4cae0476415a..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::defaultregistry::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/defaultregistry/makefile.mk -@@ -84,9 +84,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP= $(TARGET).map - SHL1DEPN= diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::implementationregistration::implreg.cxx b/editors/openoffice-3-devel/files/patch-stoc::source::implementationregistration::implreg.cxx deleted file mode 100644 index 341d621d872c..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::implementationregistration::implreg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../stoc/source/implementationregistration/implreg.cxx.orig Tue Apr 16 19:54:58 2002 -+++ ../stoc/source/implementationregistration/implreg.cxx Tue Apr 16 19:55:26 2002 -@@ -60,6 +60,8 @@ - ************************************************************************/ - #include <list> - -+#include <unistd.h> -+ - #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ - #include <cppuhelper/queryinterface.hxx> - #endif diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::implementationregistration::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::implementationregistration::makefile.mk deleted file mode 100644 index 0051043b7ecb..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::implementationregistration::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/implementationregistration/makefile.mk -@@ -85,9 +85,9 @@ - SHL1VERSIONMAP=$(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::inspect::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::inspect::makefile.mk deleted file mode 100644 index c7cd85253c11..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::inspect::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/inspect/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::invocation::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::invocation::makefile.mk deleted file mode 100644 index 9ac2072a5612..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::invocation::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/invocation/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP=$(TARGET).map - SHL1DEPN= diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk deleted file mode 100644 index 8853ad39a90e..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/invocation_adapterfactory/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP= $(TARGET).map - diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::javaloader::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::javaloader::makefile.mk deleted file mode 100644 index af0fb9af619c..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::javaloader::makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javaloader/makefile.mk -@@ -83,9 +83,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS=\ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ -- $(CPPULIB) \ -- $(SALLIB) -+ $(CPPULIB) -+ - SHL1VERSIONMAP=$(TARGET).map - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::javavm::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::javavm::makefile.mk deleted file mode 100644 index f97af0ea270d..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::javavm::makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/javavm/makefile.mk -@@ -91,10 +91,10 @@ - SHL1TARGET= $(TARGET) - SHL1VERSIONMAP=$(TARGET).map - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ -- $(UNOLIB) \ -- $(SALLIB) -+ $(UNOLIB) - - .IF "$(GUI)"=="WNT" - SHL1STDLIBS += advapi32.lib diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::loader::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::loader::makefile.mk deleted file mode 100644 index 5a08ee5937b6..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::loader::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/loader/makefile.mk -@@ -83,9 +83,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP=$(TARGET).map - SHL1DEPN= diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::namingservice::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::namingservice::makefile.mk deleted file mode 100644 index e573081bc21d..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::namingservice::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/namingservice/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1VERSIONMAP=$(TARGET).map - diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::proxy_factory::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::proxy_factory::makefile.mk deleted file mode 100644 index 9110b2f50cd1..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::proxy_factory::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/proxy_factory/makefile.mk -@@ -85,9 +85,9 @@ - SHL1VERSIONMAP=$(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB=i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk deleted file mode 100644 index 9d974d1c0d10..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002 -+++ ../stoc/source/registry_tdprovider/makefile.mk -@@ -88,10 +88,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(SALHELPERLIB) \ -- $(SALLIB) -+ $(SALHELPERLIB) - - SHL1DEPN= - SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::servicemanager::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::servicemanager::makefile.mk deleted file mode 100644 index 746776d54759..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::servicemanager::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/servicemanager/makefile.mk -@@ -84,9 +84,9 @@ - SHL1VERSIONMAP=$(TARGET).map - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::tdmanager::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::tdmanager::makefile.mk deleted file mode 100644 index 76403fdde841..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::tdmanager::makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/tdmanager/makefile.mk -@@ -83,9 +83,10 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) -+ - SHL1VERSIONMAP=$(TARGET).map - - SHL1DEPN= diff --git a/editors/openoffice-3-devel/files/patch-stoc::source::typeconv::makefile.mk b/editors/openoffice-3-devel/files/patch-stoc::source::typeconv::makefile.mk deleted file mode 100644 index dc647f89a166..000000000000 --- a/editors/openoffice-3-devel/files/patch-stoc::source::typeconv::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002 -+++ ../stoc/source/typeconv/makefile.mk -@@ -82,9 +82,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1VERSIONMAP= $(TARGET).map diff --git a/editors/openoffice-3-devel/files/patch-svx::source::fmcomp::makefile.mk b/editors/openoffice-3-devel/files/patch-svx::source::fmcomp::makefile.mk deleted file mode 100644 index b16030080c0d..000000000000 --- a/editors/openoffice-3-devel/files/patch-svx::source::fmcomp::makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../svx/source/fmcomp/makefile.mk.orig Sun May 19 14:22:34 2002 -+++ ../svx/source/fmcomp/makefile.mk Sun May 19 14:27:48 2002 -@@ -74,6 +74,9 @@ - .INCLUDE : sv.mk - .INCLUDE : $(PRJ)$/util$/makefile.pmk - -+CFLAGS += -g -+CFLAGSCC += -g -+ - # --- Files -------------------------------------------------------- - - CXXFILES= \ diff --git a/editors/openoffice-3-devel/files/patch-sysui::oounix::office::gnome-vfs-filetype-registration.cxx b/editors/openoffice-3-devel/files/patch-sysui::oounix::office::gnome-vfs-filetype-registration.cxx deleted file mode 100644 index 6dc462a10d24..000000000000 --- a/editors/openoffice-3-devel/files/patch-sysui::oounix::office::gnome-vfs-filetype-registration.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Aug 28 14:10:06 2002 -+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Fri Oct 18 22:45:43 2002 -@@ -62,7 +62,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <dlfcn.h> --#ifndef MACOSX -+#if !(defined NETBSD || defined FREEBSD || defined MACOSX) - #include <alloca.h> - #endif - #include <string.h> diff --git a/editors/openoffice-3-devel/files/patch-sysui::tools::lngconv::lngconv.cxx b/editors/openoffice-3-devel/files/patch-sysui::tools::lngconv::lngconv.cxx deleted file mode 100644 index 732f77fcb482..000000000000 --- a/editors/openoffice-3-devel/files/patch-sysui::tools::lngconv::lngconv.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../sysui/tools/lngconv/lngconv.cxx.orig Sat Jul 20 23:14:29 2002 -+++ ../sysui/tools/lngconv/lngconv.cxx Sat Jul 20 23:14:34 2002 -@@ -62,7 +62,7 @@ - #include <stdlib.h> - #include <stdio.h> - --#if defined( LINUX ) || defined (SOLARIS) -+#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD) - #include <locale.h> - #include <langinfo.h> - #endif diff --git a/editors/openoffice-3-devel/files/patch-tools::bootstrp::makefile.mk b/editors/openoffice-3-devel/files/patch-tools::bootstrp::makefile.mk deleted file mode 100644 index b188641846f0..000000000000 --- a/editors/openoffice-3-devel/files/patch-tools::bootstrp::makefile.mk +++ /dev/null @@ -1,23 +0,0 @@ ---- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 -+++ ../tools/bootstrp/makefile.mk -@@ -83,6 +83,15 @@ - @echo No bootstrp for Mac OS - .ELSE # "$(OS)"=="MACOS" - -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR -+ @echo "" -+$(LB)$/libgcc_pic.a: -+ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc_pic.a $(LB)$/libgcc_pic.a -+$(LB)$/libgcc.a: -+ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a -+.ENDIF -+ - OBJFILES= \ - $(OBJ)$/sstring.obj \ - $(OBJ)$/appdef.obj \ -@@ -172,3 +181,4 @@ - # --- Targets ------------------------------------------------------ - - .INCLUDE : target.mk -+ diff --git a/editors/openoffice-3-devel/files/patch-tools::inc::inetdef.hxx b/editors/openoffice-3-devel/files/patch-tools::inc::inetdef.hxx deleted file mode 100644 index a9e02c684019..000000000000 --- a/editors/openoffice-3-devel/files/patch-tools::inc::inetdef.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../tools/inc/inetdef.hxx.orig Sun Jul 21 00:59:36 2002 -+++ ../tools/inc/inetdef.hxx Sun Jul 21 00:59:38 2002 -@@ -90,6 +90,8 @@ - #define TOOLS_INETDEF_OS "NETBSD Sparc" - #elif defined LINUX && defined X86 - #define TOOLS_INETDEF_OS "Linux" -+#elif defined FREEBSD && defined X86 -+#define TOOLS_INETDEF_OS "FreeBSD" - #elif defined SINIX - #define TOOLS_INETDEF_OS "SINIX" - #elif defined IRIX diff --git a/editors/openoffice-3-devel/files/patch-tools::source::string::tstring.cxx b/editors/openoffice-3-devel/files/patch-tools::source::string::tstring.cxx deleted file mode 100644 index 12bd6bd0b244..000000000000 --- a/editors/openoffice-3-devel/files/patch-tools::source::string::tstring.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 -+++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 -@@ -103,6 +103,9 @@ - xub_StrLen ImplStringLen( const sal_Char* pStr ) - { - const sal_Char* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - pTempStr++; - return (xub_StrLen)(pTempStr-pStr); -@@ -113,6 +116,9 @@ - xub_StrLen ImplStringLen( const sal_Unicode* pStr ) - { - const sal_Unicode* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - pTempStr++; - return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-3-devel/files/patch-ucb::source::ucp::webdav::makefile.mk b/editors/openoffice-3-devel/files/patch-ucb::source::ucp::webdav::makefile.mk deleted file mode 100644 index 4b505c6571d8..000000000000 --- a/editors/openoffice-3-devel/files/patch-ucb::source::ucp::webdav::makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../ucb/source/ucp/webdav/makefile.mk.orig Wed Jun 12 01:04:43 2002 -+++ ../ucb/source/ucp/webdav/makefile.mk Wed Jun 12 01:04:53 2002 -@@ -120,7 +120,7 @@ - - SHL1TARGET=$(TARGET)$(UCP_VERSION) - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - .ELSE - SHL1VERSIONMAP=exports.map - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-unoil::makefile.pmk b/editors/openoffice-3-devel/files/patch-unoil::makefile.pmk deleted file mode 100644 index 7febdabf7b4b..000000000000 --- a/editors/openoffice-3-devel/files/patch-unoil::makefile.pmk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../unoil/makefile.pmk.orig Fri Aug 31 18:04:43 2001 -+++ ../unoil/makefile.pmk Thu Sep 12 12:17:50 2002 -@@ -74,8 +74,8 @@ - JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java) - .ENDIF # "$(L10N_framework)"=="" - --GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) --GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) -+GENJAVAFILES += $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) -+GENCLASSFILES += $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) - - # --- Targets ------------------------------------------------------ - diff --git a/editors/openoffice-3-devel/files/patch-unzip::source::file_io.c b/editors/openoffice-3-devel/files/patch-unzip::source::file_io.c deleted file mode 100644 index 2f85a108c185..000000000000 --- a/editors/openoffice-3-devel/files/patch-unzip::source::file_io.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002 -+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 2002 -@@ -500,7 +500,7 @@ - #ifdef MPW - pCallBack( 0 ); - #else -- #if defined LINUX || defined MACOSX || defined NETBSD -+ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD - pCallBack( lseek(outfd, 0, SEEK_CUR) ); - #else - pCallBack( tell( outfd ) ); -@@ -865,7 +865,9 @@ - static struct timeb tbp; - #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(NETBSD) && !defined(FREEBSD)) - extern long timezone; -+#endif /* !defined(NETBSD) && !defined(FREEBSD) */ - #endif /* ?BSD */ - #endif /* ?AMIGA */ - diff --git a/editors/openoffice-3-devel/files/patch-unzip::source::misc.c b/editors/openoffice-3-devel/files/patch-unzip::source::misc.c deleted file mode 100644 index 3da53f865c0b..000000000000 --- a/editors/openoffice-3-devel/files/patch-unzip::source::misc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../unzip/source/misc.c.orig Wed May 2 03:13:26 2001 -+++ ../unzip/source/misc.c Fri Oct 18 23:37:13 2002 -@@ -300,7 +300,7 @@ - static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - int yr, mo, dy, hh, mm, ss, leap; - long m_time, days=0; --#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) -+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ - static struct timeb tbp; diff --git a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::osssound.cxx b/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::osssound.cxx deleted file mode 100644 index af681e020472..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::osssound.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- ../vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 -+++ ../vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 -@@ -72,7 +72,11 @@ - #include <unistd.h> - #include <string.h> - #include <sys/ioctl.h> -+#ifdef LINUX - #include <linux/soundcard.h> -+#else -+#include <sys/soundcard.h> -+#endif - #include <errno.h> - - #ifdef _USE_NAMESPACE diff --git a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::rptpsound.cxx b/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::rptpsound.cxx deleted file mode 100644 index fca5510022f9..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::rptpsound.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- ../vcl/unx/source/app/rptpsound.cxx.orig Wed Oct 24 18:32:21 2001 -+++ ../vcl/unx/source/app/rptpsound.cxx Sun Jun 2 22:01:07 2002 -@@ -78,6 +78,10 @@ - extern "C" int usleep(unsigned int); - #endif - -+#ifdef FREEBSD -+#include <unistd.h> -+#endif -+ - #ifdef _USE_NAMESPACE - using namespace vcl_sal; - using namespace vos; diff --git a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::saldata.cxx b/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::saldata.cxx deleted file mode 100644 index c292a93a8313..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::saldata.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- ../vcl/unx/source/app/saldata.cxx.orig Sun Jun 2 22:07:34 2002 -+++ ../vcl/unx/source/app/saldata.cxx Sun Jun 2 22:08:22 2002 -@@ -78,6 +78,11 @@ - #ifdef AIX - #include <strings.h> - #endif -+#ifdef FREEBSD -+#include <sys/types.h> -+#include <sys/time.h> -+#include <unistd.h> -+#endif - - #ifndef _VOS_MUTEX_HXX - #include <vos/mutex.hxx> diff --git a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::vsound.hxx b/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::vsound.hxx deleted file mode 100644 index 028e7c9d64c1..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl::unx::source::app::vsound.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ../vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 -+++ ../vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 -@@ -61,7 +61,7 @@ - #ifndef _VCL_VSOUND_HXX - #define _VCL_VSOUND_HXX - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - #define USE_OSS - #endif - -@@ -69,7 +69,7 @@ - #define USE_DEVAUDIO - #endif - --#if defined LINUX || defined SOLARIS -+#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS) - #define USE_NAS - #endif - diff --git a/editors/openoffice-3-devel/files/patch-vcl::util::makefile.mk b/editors/openoffice-3-devel/files/patch-vcl::util::makefile.mk deleted file mode 100644 index 1ea13157ce57..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl::util::makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 -+++ ../vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 -@@ -293,9 +293,9 @@ - .ENDIF # "$(OS)"=="MACOSX" - .ENDIF # "$(OS)"=="SOLARIS" - --.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - SHL1STDLIBS += -laudio --.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - - .ENDIF # "$(GUI)"=="UNX" - |