diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:52:57 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:52:57 +0000 |
| commit | a0ccee8b339cbd7d2a5be2f23fa0b2f51d8bbd78 (patch) | |
| tree | 1a9632c02a53b6df96425fec98a823006618e1bf /editors/openoffice-1.1-devel/files | |
| parent | First step to make this port working. Configure works and all patches (diff) | |
Re-add previously deleted files.
Notes
Notes:
svn path=/head/; revision=68300
Diffstat (limited to 'editors/openoffice-1.1-devel/files')
63 files changed, 5323 insertions, 0 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-berkeleydb::db-3.2.9.patch b/editors/openoffice-1.1-devel/files/patch-berkeleydb::db-3.2.9.patch new file mode 100644 index 000000000000..5039502f793d --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-berkeleydb::db-3.2.9.patch @@ -0,0 +1,68 @@ +--- ../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-1.1-devel/files/patch-bridges::prj::build.lst b/editors/openoffice-1.1-devel/files/patch-bridges::prj::build.lst new file mode 100644 index 000000000000..7d2bed72bcaa --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-bridges::prj::build.lst @@ -0,0 +1,10 @@ +--- ../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-1.1-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel b/editors/openoffice-1.1-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel new file mode 100644 index 000000000000..0f950202dd43 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel @@ -0,0 +1,1719 @@ +--- /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-1.1-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel b/editors/openoffice-1.1-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel new file mode 100644 index 000000000000..20b13ea25cb2 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel @@ -0,0 +1,1608 @@ +--- /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-1.1-devel/files/patch-bridges::source::prot_uno::makefile.mk b/editors/openoffice-1.1-devel/files/patch-bridges::source::prot_uno::makefile.mk new file mode 100644 index 000000000000..595ea6cb5ac9 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-bridges::source::prot_uno::makefile.mk @@ -0,0 +1,13 @@ +--- ../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-1.1-devel/files/patch-comphelper::util::makefile.mk b/editors/openoffice-1.1-devel/files/patch-comphelper::util::makefile.mk new file mode 100644 index 000000000000..997719c43dd8 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-comphelper::util::makefile.mk @@ -0,0 +1,15 @@ +--- ../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-1.1-devel/files/patch-config_office::configure.in b/editors/openoffice-1.1-devel/files/patch-config_office::configure.in new file mode 100644 index 000000000000..b10dca2be517 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-config_office::configure.in @@ -0,0 +1,48 @@ +--- 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-1.1-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk b/editors/openoffice-1.1-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk new file mode 100644 index 000000000000..f99a49c36067 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk @@ -0,0 +1,12 @@ +--- ../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-1.1-devel/files/patch-cppu::prj::build.lst b/editors/openoffice-1.1-devel/files/patch-cppu::prj::build.lst new file mode 100644 index 000000000000..78fd210a1193 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-cppu::prj::build.lst @@ -0,0 +1,8 @@ +--- ../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-1.1-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-1.1-devel/files/patch-cppuhelper::source::makefile.mk new file mode 100644 index 000000000000..62e971de324a --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper::source::makefile.mk @@ -0,0 +1,24 @@ +--- ../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-1.1-devel/files/patch-dmake::unix::linux::gnu::make.sh b/editors/openoffice-1.1-devel/files/patch-dmake::unix::linux::gnu::make.sh new file mode 100644 index 000000000000..d60afa8e32e8 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-dmake::unix::linux::gnu::make.sh @@ -0,0 +1,244 @@ +--- ../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-1.1-devel/files/patch-dtrans::source::X11::makefile.mk b/editors/openoffice-1.1-devel/files/patch-dtrans::source::X11::makefile.mk new file mode 100644 index 000000000000..5881f5d7f6a5 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-dtrans::source::X11::makefile.mk @@ -0,0 +1,12 @@ +--- ../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-1.1-devel/files/patch-eventattacher::source::makefile.mk b/editors/openoffice-1.1-devel/files/patch-eventattacher::source::makefile.mk new file mode 100644 index 000000000000..b09408500c2d --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-eventattacher::source::makefile.mk @@ -0,0 +1,15 @@ +--- ../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-1.1-devel/files/patch-external::dt::dtpatch.sh b/editors/openoffice-1.1-devel/files/patch-external::dt::dtpatch.sh new file mode 100644 index 000000000000..e5122bcb45c1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-external::dt::dtpatch.sh @@ -0,0 +1,11 @@ +--- ../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-1.1-devel/files/patch-external::npsdk::npsdkpatch.sh b/editors/openoffice-1.1-devel/files/patch-external::npsdk::npsdkpatch.sh new file mode 100644 index 000000000000..49a3056831dd --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-external::npsdk::npsdkpatch.sh @@ -0,0 +1,11 @@ +--- ../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-1.1-devel/files/patch-freetype::makefile.mk b/editors/openoffice-1.1-devel/files/patch-freetype::makefile.mk new file mode 100644 index 000000000000..da0dd090d0e6 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-freetype::makefile.mk @@ -0,0 +1,15 @@ +--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 ++++ ../freetype/makefile.mk Fri Oct 18 20:06:42 2002 +@@ -95,9 +95,11 @@ + objs$/.libs$/libfreetype.a + .IF "$(OS)"=="MACOSX" + OUT2LIB+=objs$/.libs$/libfreetype.*.dylib ++.ELSEIF "$(OS)"=="FREEBSD" ++OUT2LIB+=objs$/.libs$/libfreetype.so.7* + .ELSE + OUT2LIB+=objs$/.libs$/libfreetype.so.6* +-.ENDIF # "$(OS)"=="MACOSX" ++.ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" + + .ELSE # "$(GUI)"=="UNX" + .IF "$(USE_SHELL)"=="4nt" diff --git a/editors/openoffice-1.1-devel/files/patch-javaunohelper::source::makefile.mk b/editors/openoffice-1.1-devel/files/patch-javaunohelper::source::makefile.mk new file mode 100644 index 000000000000..7f2cd2f1d220 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-javaunohelper::source::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-nas:nas-1.4.1.patch b/editors/openoffice-1.1-devel/files/patch-nas:nas-1.4.1.patch new file mode 100644 index 000000000000..8623e0bd5892 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-nas:nas-1.4.1.patch @@ -0,0 +1,176 @@ +--- ../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-1.1-devel/files/patch-odk::pack::unzip_udk::makefile.mk b/editors/openoffice-1.1-devel/files/patch-odk::pack::unzip_udk::makefile.mk new file mode 100644 index 000000000000..c90775d4162c --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-odk::pack::unzip_udk::makefile.mk @@ -0,0 +1,18 @@ +--- ../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-1.1-devel/files/patch-offapi::util::makefile.pmk b/editors/openoffice-1.1-devel/files/patch-offapi::util::makefile.pmk new file mode 100644 index 000000000000..5cdbb1b4aa4a --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-offapi::util::makefile.pmk @@ -0,0 +1,11 @@ +--- ../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-1.1-devel/files/patch-product::util::makefile.mk b/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk new file mode 100644 index 000000000000..d09ce5c7f40a --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk @@ -0,0 +1,11 @@ +--- ../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-1.1-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice-1.1-devel/files/patch-registry::source::regkey.cxx new file mode 100644 index 000000000000..fad069f83f14 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-registry::source::regkey.cxx @@ -0,0 +1,12 @@ +--- ../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-1.1-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk b/editors/openoffice-1.1-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk new file mode 100644 index 000000000000..72e5a97234f4 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-remotebridges::source::unourl_resolver::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-rsc::source::rscpp::cpp.h b/editors/openoffice-1.1-devel/files/patch-rsc::source::rscpp::cpp.h new file mode 100644 index 000000000000..417ab33ba52f --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-rsc::source::rscpp::cpp.h @@ -0,0 +1,12 @@ +--- ../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-1.1-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch new file mode 100644 index 000000000000..6a320b4dac59 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch @@ -0,0 +1,11 @@ +--- ../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-1.1-devel/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::nlsupport.c new file mode 100644 index 000000000000..f82943872ab0 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::nlsupport.c @@ -0,0 +1,131 @@ +--- ../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-1.1-devel/files/patch-sal::osl::unx::pipe.c b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::pipe.c new file mode 100644 index 000000000000..4aa7b8af1a61 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::pipe.c @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-sal::osl::unx::socket.c b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::socket.c new file mode 100644 index 000000000000..9541cac8583f --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::socket.c @@ -0,0 +1,26 @@ +--- ../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-1.1-devel/files/patch-sal::osl::unx::system.c b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::system.c new file mode 100644 index 000000000000..8dc663ac03fc --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::system.c @@ -0,0 +1,127 @@ +--- ../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-1.1-devel/files/patch-sal::osl::unx::system.h b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::system.h new file mode 100644 index 000000000000..d75cac79f29e --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::system.h @@ -0,0 +1,17 @@ +--- ../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-1.1-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice-1.1-devel/files/patch-sal::workben::makefile.mk new file mode 100644 index 000000000000..369935e31d66 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::workben::makefile.mk @@ -0,0 +1,29 @@ +--- ../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-1.1-devel/files/patch-salhelper::source::makefile.mk b/editors/openoffice-1.1-devel/files/patch-salhelper::source::makefile.mk new file mode 100644 index 000000000000..3687664d8d16 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-salhelper::source::makefile.mk @@ -0,0 +1,13 @@ +--- ../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-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice-1.1-devel/files/patch-set_soenv.1 new file mode 100644 index 000000000000..6b8fb4da3973 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-set_soenv.1 @@ -0,0 +1,242 @@ +--- set_soenv.1.orig Fri Aug 16 12:21:58 2002 ++++ set_soenv.1 Fri Oct 18 22:56:36 2002 +@@ -40,7 +40,7 @@ + # + # Set this value equal to the corresponding amount of + # command line arguments. +-my $numArgs = 20; ++my $numArgs = 27; + # Determining the amount of arguments in the call. + my $numEnter = $#ARGV + 1; + if ( $numEnter != $numArgs ) +@@ -66,14 +66,16 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE, $RSC_ONCE ); + # + # Platform dependent constant values. + my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, + $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, +- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); ++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, ++ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); ++ + # + #------------------------------------------- + # IIc. Declaring the environment variables. +@@ -96,7 +98,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -145,7 +147,11 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_SHELL = $ARGV [ 18 ]; # preferred shell +-$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) ++$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) ++$CC = $ARGV [ 23 ]; # get cc from environment ++$CXX = $ARGV [ 24 ]; # use c++ from environment ++$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type ++$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -336,7 +342,14 @@ + $COMPATH = $ARGV[ 0 ]; + $CPU = "I"; + $CPUNAME = "INTEL"; ++if ($USE_GCC3 eq "TRUE") ++ { ++ $CVER = "C300"; ++ } ++else ++ { + $CVER = "C295"; ++} + $DLLSUFFIX = "fi"; + $GUI = "UNX"; + $GUIBASE = "unx"; +@@ -349,6 +362,9 @@ + $PATH_SEPERATOR = $ps; + $PROSWITCH = "-DPRODUCT"; + $XPVERSION = "3"; ++ $OSVERSION = $ARGV[ 20 ]; ++ $PTHREAD_CFLAGS = $ARGV[ 21 ]; ++ $PTHREAD_LIBS = $ARGV[ 22 ]; + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; +@@ -934,7 +950,7 @@ + $ps.$JRETHREADDIR. + $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; + } +-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) ++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) + { $LD_LIBRARY_PATH = $cur_dir. + $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. + $ps.$JRELIBDIR. +@@ -945,6 +961,13 @@ + $ps_STLPORT_LIB. + $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; + } ++elsif ($platform eq "$FreeBSD") ++{ $LD_LIBRARY_PATH = $cur_dir. ++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. ++ $ps.$par_dir.$LIB. ++ $ps_STLPORT_LIB. ++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; ++} + elsif ($platform eq "$Irix" || $platform eq "$Irix64") + { $LD_LIBRARY_PATH = $cur_dir. + $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. +@@ -986,15 +1009,16 @@ + $D.$COM. + $D.$CVER. + $D.$GVER. +- $D."_PTHREADS". + $D.$OS. + $D.$CPUNAME; + if ($platform eq "$FreeBSD") +-{ $SOLARDEF .= $D."X86"; ++{ $SOLARDEF .= $D."X86". ++ $D."OSVERSION=$OSVERSION". ++ " ".$PTHREAD_CFLAGS; + } + $SOLARDEF .= $D."_REENTRANT". + $D."_POSIX_PTHREAD_SEMANTICS"; +-if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64")) ++if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" )) + { $SOLARDEF .= $D."GLIBC=".$GLIBC; + } + $SOLARDEF .= $D."SUPD=$UPD". +@@ -1011,7 +1035,7 @@ + $L.$USR_DT.$LIB. + $L.$USR_OPENWIN.$LIB.'"'; + } +-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) ++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) + { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. + $L.$LIB. + $L.$USR.$LIB. +@@ -1021,6 +1045,11 @@ + { $SOLAREXTRALIB = '"'.$L.$LIB. + $L.$USR.$LIB.'"'; + } ++elsif ($platform eq "$FreeBSD") ++{ ++ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.'"'; ++} ++ + # Compiler include search directory paths. + if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) + { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; +@@ -1099,7 +1128,7 @@ + $ps.$USR.$LIB. + $ps.$USR_LOCAL.$BIN; + } +-elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) ++elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) + { $PATH = $cur_dir. + $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. + $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. +@@ -1118,6 +1147,22 @@ + $ps.$USR.$ds."X11".$BIN. + $ps.$USR.$LIB; + } ++elsif ($platform eq "$FreeBSD") ++{ $PATH = $cur_dir. ++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. ++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. ++ $ps.'$SOLARENV'.$BIN. ++ $ps.'$JAVA_HOME'.$BIN. ++ $ps.$USR_LOCAL.$BIN. ++ $ps.$USR_LOCAL.$ds."sbin"; ++ ++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler); ++ ++ $PATH .= $ps.$USR.$ds."sbin". ++ $ps.$USR.$ds."X11R6".$ds."bin". ++ $ps.$USR.$LIB; ++} ++ + elsif ($platform eq "$Winnt") + { + my ( $noldPATH ); +@@ -1227,7 +1272,7 @@ + $L_STLPORT_LIB. + $L.$XLIB.'"'; + } +-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) ++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) + { $SOLARLIB = '"'.$L.$par_dir.$LIB. + $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. + $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. +@@ -1242,6 +1287,15 @@ + $L_STLPORT_LIB. + $L.$XLIB.'"'; + } ++elsif ($platform eq "$FreeBSD") ++{ $SOLARLIB = '"'.$L.$par_dir.$LIB. ++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. ++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. ++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. ++ $L.'$JAVA_HOME'.$LIB. ++ $L_STLPORT_LIB. ++ $L.$XLIB.'"'; ++} + elsif ($platform eq "$Winnt") + { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. + $L.$par_dir.$LIB. +@@ -1280,7 +1334,7 @@ + $SOLARINC .= $I.$USR.$INCLUDE; + } + $SOLARINC .= $STLPORT_stlport; +-if ($platform eq "$Linux") ++if ($platform eq "$Linux" || $platform eq "$FreeBSD") + { + # This simply adds an include path, so even cases that break the FHS work + $SOLARINC .= $STLPORT_inc_stlport; +@@ -1294,11 +1348,6 @@ + { $SOLARINC .= $I.'$COMPATH'.$ds."include"; + } + +-if ($platform eq "$Linux") +-{ +-# This simply adds an include path, so even cases that break the FHS work +-$SOLARINC .= $STLPORT_inc_stlport; +-} + $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". + $I.'$JAVA_HOME'.$INCLUDE; + +@@ -1501,6 +1550,12 @@ + ToFile( "GUIENV", $GUIENV, "e" ); + ToFile( "GVER", $GVER, "e" ); + ToFile( "OS", $OS, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ++ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" ); ++ToFile( "OSVERSION", $OSVERSION, "e" ); ++ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" ); ++ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" ); + ToFile( "OUTPATH", $OUTPATH, "e" ); + ToFile( "INPATH", $INPATH, "e" ); + ToFile( "GVERDIR", $GVERDIR, "e" ); +@@ -1515,6 +1570,9 @@ + ToFile( "SET_EXCEPTIONS", $SET_EXCEPTIONS, "e" ); + ToFile( "emergency", $emergency, "e" ); + ToFile( "use_shl_versions", $use_shl_versions, "e" ); ++if ($ENABLE_DEBUG eq "TRUE") { ++ToFile( "debug", "true", "e" ); ++} + # + # Writing the variables to file. + # (c = comment, e = environment variable, a = alias, n = newline ) diff --git a/editors/openoffice-1.1-devel/files/patch-setup2::mow::source::loader::loader.c b/editors/openoffice-1.1-devel/files/patch-setup2::mow::source::loader::loader.c new file mode 100644 index 000000000000..a71f7b3f327c --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-setup2::mow::source::loader::loader.c @@ -0,0 +1,17 @@ +--- ../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-1.1-devel/files/patch-setup2::mow::source::loader::makefile.mk b/editors/openoffice-1.1-devel/files/patch-setup2::mow::source::loader::makefile.mk new file mode 100644 index 000000000000..007c0f69b6f9 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-setup2::mow::source::loader::makefile.mk @@ -0,0 +1,11 @@ +--- ../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-1.1-devel/files/patch-setup2::script::setupserver b/editors/openoffice-1.1-devel/files/patch-setup2::script::setupserver new file mode 100644 index 000000000000..450ea386c841 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-setup2::script::setupserver @@ -0,0 +1,10 @@ +--- ../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-1.1-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh b/editors/openoffice-1.1-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh new file mode 100644 index 000000000000..f199b18823e1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh @@ -0,0 +1,10 @@ +--- ../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-1.1-devel/files/patch-shell::source::cmdmail::makefile.mk b/editors/openoffice-1.1-devel/files/patch-shell::source::cmdmail::makefile.mk new file mode 100644 index 000000000000..0476285c802e --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-shell::source::cmdmail::makefile.mk @@ -0,0 +1,16 @@ +--- ../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-1.1-devel/files/patch-shell::source::proxysettings::makefile.mk b/editors/openoffice-1.1-devel/files/patch-shell::source::proxysettings::makefile.mk new file mode 100644 index 000000000000..e83cf7c9d7a1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-shell::source::proxysettings::makefile.mk @@ -0,0 +1,16 @@ +--- ../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-1.1-devel/files/patch-shell::source::unix::exec::makefile.mk b/editors/openoffice-1.1-devel/files/patch-shell::source::unix::exec::makefile.mk new file mode 100644 index 000000000000..0b7712ee35f8 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-shell::source::unix::exec::makefile.mk @@ -0,0 +1,16 @@ +--- ../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-1.1-devel/files/patch-solenv::inc::settings.mk b/editors/openoffice-1.1-devel/files/patch-solenv::inc::settings.mk new file mode 100644 index 000000000000..ea6a898a9a6d --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-solenv::inc::settings.mk @@ -0,0 +1,19 @@ +--- ../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-1.1-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk b/editors/openoffice-1.1-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk new file mode 100644 index 000000000000..0c1b107de988 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk @@ -0,0 +1,5 @@ +--- /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-1.1-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-1.1-devel/files/patch-solenv::inc::tg_ext.mk new file mode 100644 index 000000000000..701692c9425a --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-solenv::inc::tg_ext.mk @@ -0,0 +1,12 @@ +--- ../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-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk new file mode 100644 index 000000000000..b189474e5f82 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk @@ -0,0 +1,209 @@ +--- ../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-1.1-devel/files/patch-soltools::mkdepend::main.c b/editors/openoffice-1.1-devel/files/patch-soltools::mkdepend::main.c new file mode 100644 index 000000000000..cffd5cbb1f43 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-soltools::mkdepend::main.c @@ -0,0 +1,12 @@ +--- ../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-1.1-devel/files/patch-stoc::source::corereflection::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::corereflection::makefile.mk new file mode 100644 index 000000000000..4b319b08d401 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::corereflection::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::defaultregistry::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::defaultregistry::makefile.mk new file mode 100644 index 000000000000..4cae0476415a --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::defaultregistry::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::implementationregistration::implreg.cxx b/editors/openoffice-1.1-devel/files/patch-stoc::source::implementationregistration::implreg.cxx new file mode 100644 index 000000000000..341d621d872c --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::implementationregistration::implreg.cxx @@ -0,0 +1,11 @@ +--- ../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-1.1-devel/files/patch-stoc::source::implementationregistration::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::implementationregistration::makefile.mk new file mode 100644 index 000000000000..0051043b7ecb --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::implementationregistration::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::inspect::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::inspect::makefile.mk new file mode 100644 index 000000000000..c7cd85253c11 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::inspect::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::invocation::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::invocation::makefile.mk new file mode 100644 index 000000000000..9ac2072a5612 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::invocation::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk new file mode 100644 index 000000000000..8853ad39a90e --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::invocation_adapterfactory::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::javaloader::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::javaloader::makefile.mk new file mode 100644 index 000000000000..af0fb9af619c --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::javaloader::makefile.mk @@ -0,0 +1,15 @@ +--- ../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-1.1-devel/files/patch-stoc::source::javavm::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::javavm::makefile.mk new file mode 100644 index 000000000000..f97af0ea270d --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::javavm::makefile.mk @@ -0,0 +1,15 @@ +--- ../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-1.1-devel/files/patch-stoc::source::loader::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::loader::makefile.mk new file mode 100644 index 000000000000..5a08ee5937b6 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::loader::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::namingservice::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::namingservice::makefile.mk new file mode 100644 index 000000000000..e573081bc21d --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::namingservice::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::proxy_factory::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::proxy_factory::makefile.mk new file mode 100644 index 000000000000..9110b2f50cd1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::proxy_factory::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk new file mode 100644 index 000000000000..9d974d1c0d10 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::registry_tdprovider::makefile.mk @@ -0,0 +1,15 @@ +--- ../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-1.1-devel/files/patch-stoc::source::servicemanager::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::servicemanager::makefile.mk new file mode 100644 index 000000000000..746776d54759 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::servicemanager::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-stoc::source::tdmanager::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::tdmanager::makefile.mk new file mode 100644 index 000000000000..76403fdde841 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::tdmanager::makefile.mk @@ -0,0 +1,15 @@ +--- ../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-1.1-devel/files/patch-stoc::source::typeconv::makefile.mk b/editors/openoffice-1.1-devel/files/patch-stoc::source::typeconv::makefile.mk new file mode 100644 index 000000000000..dc647f89a166 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-stoc::source::typeconv::makefile.mk @@ -0,0 +1,14 @@ +--- ../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-1.1-devel/files/patch-tools::bootstrp::makefile.mk b/editors/openoffice-1.1-devel/files/patch-tools::bootstrp::makefile.mk new file mode 100644 index 000000000000..b188641846f0 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-tools::bootstrp::makefile.mk @@ -0,0 +1,23 @@ +--- ../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-1.1-devel/files/patch-unzip::source::misc.c b/editors/openoffice-1.1-devel/files/patch-unzip::source::misc.c new file mode 100644 index 000000000000..3da53f865c0b --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-unzip::source::misc.c @@ -0,0 +1,11 @@ +--- ../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; |