diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-08-22 00:38:29 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-08-22 00:38:29 +0000 |
| commit | 8ececbacd47da70e8ad53e60800e85999665fb21 (patch) | |
| tree | 4c494a32b5b59fb7d5eed21b8f049f222a0e104c /editors/openoffice.org-2.0/files | |
| parent | - Fix build on 4.x [1] (diff) | |
Update the patch-i66667, and broken for amd64
Notes
Notes:
svn path=/head/; revision=171136
Diffstat (limited to 'editors/openoffice.org-2.0/files')
| -rw-r--r-- | editors/openoffice.org-2.0/files/patch-i66667 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/editors/openoffice.org-2.0/files/patch-i66667 b/editors/openoffice.org-2.0/files/patch-i66667 index 411c38f84a7f..b73949eee465 100644 --- a/editors/openoffice.org-2.0/files/patch-i66667 +++ b/editors/openoffice.org-2.0/files/patch-i66667 @@ -4,7 +4,7 @@ RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v retrieving revision 1.14.88.1 diff -u -r1.14.88.1 gtkinst.cxx --- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1 -+++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000 ++++ vcl/unx/gtk/app/gtkinst.cxx 21 Aug 2006 05:38:21 -0000 @@ -43,6 +43,7 @@ #include <plugins/gtk/atkbridge.hxx> @@ -13,7 +13,7 @@ diff -u -r1.14.88.1 gtkinst.cxx #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> -@@ -111,11 +112,26 @@ +@@ -111,13 +112,28 @@ GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX(); pYieldMutex->ThreadsLeave(); } @@ -39,8 +39,11 @@ diff -u -r1.14.88.1 gtkinst.cxx + } + GdkLockFn gdk_threads_set_lock_functions = - (GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData ); +- (GdkLockFn) osl_getFunctionSymbol( 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 ); |