aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2006-08-22 08:38:29 +0800
committermaho <maho@FreeBSD.org>2006-08-22 08:38:29 +0800
commit0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6 (patch)
tree22202d735521f1f9580c214b97b83ae349876d95
parent86e0c70d6cf4b00048b7b6a672fbd9bbc48d6427 (diff)
downloadfreebsd-ports-graphics-0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6.tar.gz
freebsd-ports-graphics-0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6.tar.zst
freebsd-ports-graphics-0db4c87d626e718ee7ed37a1f5270ba6ce89f4d6.zip
Update the patch-i66667, and broken for amd64
Diffstat
-rw-r--r--editors/openoffice-3/Makefile2
-rw-r--r--editors/openoffice-3/files/patch-i666679
-rw-r--r--editors/openoffice.org-2-RC/Makefile2
-rw-r--r--editors/openoffice.org-2-RC/files/patch-i666679
-rw-r--r--editors/openoffice.org-2.0/Makefile2
-rw-r--r--editors/openoffice.org-2.0/files/patch-i666679
-rw-r--r--editors/openoffice.org-2/Makefile2
-rw-r--r--editors/openoffice.org-2/files/patch-i666679
-rw-r--r--editors/openoffice.org-3-RC/Makefile2
-rw-r--r--editors/openoffice.org-3-RC/files/patch-i666679
-rw-r--r--editors/openoffice.org-3/Makefile2
-rw-r--r--editors/openoffice.org-3/files/patch-i666679
12 files changed, 42 insertions, 24 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 92b8ce63f13..046c7054359 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 411c38f84a7..b73949eee46 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 );
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 92b8ce63f13..046c7054359 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/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.org-2-RC/files/patch-i66667 b/editors/openoffice.org-2-RC/files/patch-i66667
index 411c38f84a7..b73949eee46 100644
--- a/editors/openoffice.org-2-RC/files/patch-i66667
+++ b/editors/openoffice.org-2-RC/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 );
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 92b8ce63f13..046c7054359 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/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.org-2.0/files/patch-i66667 b/editors/openoffice.org-2.0/files/patch-i66667
index 411c38f84a7..b73949eee46 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 );
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 92b8ce63f13..046c7054359 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/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.org-2/files/patch-i66667 b/editors/openoffice.org-2/files/patch-i66667
index 411c38f84a7..b73949eee46 100644
--- a/editors/openoffice.org-2/files/patch-i66667
+++ b/editors/openoffice.org-2/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 );
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 92b8ce63f13..046c7054359 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/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.org-3-RC/files/patch-i66667 b/editors/openoffice.org-3-RC/files/patch-i66667
index 411c38f84a7..b73949eee46 100644
--- a/editors/openoffice.org-3-RC/files/patch-i66667
+++ b/editors/openoffice.org-3-RC/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 );
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 92b8ce63f13..046c7054359 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-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.org-3/files/patch-i66667 b/editors/openoffice.org-3/files/patch-i66667
index 411c38f84a7..b73949eee46 100644
--- a/editors/openoffice.org-3/files/patch-i66667
+++ b/editors/openoffice.org-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 );
generated by cgit (git 2.34.1) at 2024-12-25 07:27:17 +0800