diff options
| author | maho <maho@FreeBSD.org> | 2006-08-22 08:38:29 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2006-08-22 08:38:29 +0800 |
| commit | 0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6 (patch) | |
| tree | 22202d735521f1f9580c214b97b83ae349876d95 /editors/openoffice-3 | |
| parent | 86e0c70d6cf4b00048b7b6a672fbd9bbc48d6427 (diff) | |
| download | freebsd-ports-gnome-0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6.tar.gz freebsd-ports-gnome-0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6.tar.zst freebsd-ports-gnome-0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6.zip | |
Update the patch-i66667, and broken for amd64
Diffstat (limited to 'editors/openoffice-3')
| -rw-r--r-- | editors/openoffice-3/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-3/files/patch-i66667 | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 92b8ce63f13a..046c70543593 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -59,7 +59,7 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= i386 .if ${ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} diff --git a/editors/openoffice-3/files/patch-i66667 b/editors/openoffice-3/files/patch-i66667 index 411c38f84a7f..b73949eee465 100644 --- a/editors/openoffice-3/files/patch-i66667 +++ b/editors/openoffice-3/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 ); |