diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-06-24 22:59:13 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-06-24 22:59:13 +0000 |
| commit | 6418ded8220861aca20e16ddfd746847c6ed9ac5 (patch) | |
| tree | f0281639b8d4bd448a7f76599adff361ecd283a0 /editors/openoffice.org-2.0/files/patch-i66667 | |
| parent | Update to 2.14.4. (diff) | |
Update to 2.0.3rc6.
also applied i66666 amd64 fix, i66667 general fixes [1]
Submitted by: jkim [1]
Notes
Notes:
svn path=/head/; revision=166249
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice.org-2.0/files/patch-i66667 | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/editors/openoffice.org-2.0/files/patch-i66667 b/editors/openoffice.org-2.0/files/patch-i66667 new file mode 100644 index 000000000000..6e3a697c4bf0 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-i66667 @@ -0,0 +1,56 @@ +Index: gtkinst.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v +retrieving revision 1.13 +diff -u -r1.13 gtkinst.cxx +--- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13 ++++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000 +@@ -43,6 +43,7 @@ + #include <plugins/gtk/atkbridge.hxx> + + #include <rtl/strbuf.hxx> ++#include <rtl/ustrbuf.hxx> + + #if OSL_DEBUG_LEVEL > 1 + #include <stdio.h> +@@ -111,13 +112,28 @@ + GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX(); + pYieldMutex->ThreadsLeave(); + } +- static bool hookLocks( oslModule pModule ) ++ static bool hookLocks( void ) + { +- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn); ++ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn ); + rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") ); + ++ /* XXX GDK library path should be set by configure. */ ++ OUStringBuffer aModName( 128 ); ++ aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" ); ++ aModName.appendAscii( SAL_DLLEXTENSION ); ++ OUString aModule = aModName.makeStringAndClear(); ++ oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT ); ++ ++ if ( !aMod ) ++ { ++#if OSL_DEBUG_LEVEL > 1 ++ fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" ); ++#endif ++ return false; ++ } ++ + GdkLockFn gdk_threads_set_lock_functions = +- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData ); ++ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData ); + if ( !gdk_threads_set_lock_functions ) + { + #if OSL_DEBUG_LEVEL > 1 +@@ -150,7 +166,7 @@ + if ( !g_thread_supported() ) + g_thread_init( NULL ); + +- if ( hookLocks( pModule ) ) ++ if ( hookLocks() ) + pYieldMutex = new GtkHookedYieldMutex(); + else + pYieldMutex = new GtkYieldMutex(); |