aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice-3
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2011-02-13 07:42:08 +0000
committerMartin Wilke <miwi@FreeBSD.org>2011-02-13 07:42:08 +0000
commitc7cc8bce9cf9524fa1f164a48eb815a411e7baf9 (patch)
treeb0374bd98d94e6f187819dd262150a702a73cc68 /editors/openoffice-3
parent6aa05855395a508f9c40c9d783ab25f2c61c4223 (diff)
downloadports-c7cc8bce9cf9524fa1f164a48eb815a411e7baf9.tar.gz
ports-c7cc8bce9cf9524fa1f164a48eb815a411e7baf9.zip
Notes
Diffstat (limited to 'editors/openoffice-3')
-rw-r--r--editors/openoffice-3/Makefile8
-rw-r--r--editors/openoffice-3/files/rtld-workaround-i6666755
2 files changed, 0 insertions, 63 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index d607e4986dae..6d09a1f97710 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -57,11 +57,7 @@ MAKE_JOBS_SAFE= yes
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_VENDOR= freebsd bsdjava openjdk
-.if (${OSVERSION} >= 700000)
JAVA_VERSION= 1.5 1.6
-.else
-JAVA_VERSION= 1.4 1.5 1.6
-.endif
.include <${FILESDIR}/Makefile.localized>
@@ -159,10 +155,6 @@ OOOEXTENSIONS+= pdfimport/pdfimport.oxt
OOOEXTENSIONS+= swext/wiki-publisher.oxt
OOOEXTENSIONS+= report-builder.oxt
-.if (${OSVERSION} <= 602102)
-EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
-.endif
-
ICONS= ${WRKSRC}/sysui/desktop/icons
.include <${FILESDIR}/Makefile.knobs>
diff --git a/editors/openoffice-3/files/rtld-workaround-i66667 b/editors/openoffice-3/files/rtld-workaround-i66667
deleted file mode 100644
index 26c0b1b4a88c..000000000000
--- a/editors/openoffice-3/files/rtld-workaround-i66667
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: vcl/unx/gtk/app/gtkinst.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
-retrieving revision 1.14
-diff -u -r1.14 gtkinst.cxx
---- vcl/unx/gtk/app/gtkinst.cxx 19 Jun 2006 19:44:33 -0000 1.14
-+++ vcl/unx/gtk/app/gtkinst.cxx 27 Jun 2006 02:11:09 -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,27 @@
- 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_getFunctionSymbol( pModule, aSymbolName.pData );
-+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
- if ( !gdk_threads_set_lock_functions )
- {
- #if OSL_DEBUG_LEVEL > 1
-@@ -150,7 +165,7 @@
- if ( !g_thread_supported() )
- g_thread_init( NULL );
-
-- if ( hookLocks( pModule ) )
-+ if ( hookLocks() )
- pYieldMutex = new GtkHookedYieldMutex();
- else
- pYieldMutex = new GtkYieldMutex();