diff -ruNa editors.orig/openoffice.org-2/Makefile editors/openoffice.org-2/Makefile --- editors.orig/openoffice.org-2/Makefile 2010-04-01 04:48:44.000000000 +0400 +++ editors/openoffice.org-2/Makefile 2011-01-30 19:26:10.000000000 +0300 @@ -53,11 +53,7 @@ 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> @@ -138,9 +134,6 @@ .if ${ARCH} == amd64 WITHOUT_MOZILLA= yes .endif -.if (${OSVERSION} <= 602102) -EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 -.endif .if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED) EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype .endif diff -ruNa editors.orig/openoffice.org-2/distinfo editors/openoffice.org-2/distinfo --- editors.orig/openoffice.org-2/distinfo 2009-09-05 01:41:14.000000000 +0400 +++ editors/openoffice.org-2/distinfo 2011-01-30 19:30:04.000000000 +0300 @@ -1,12 +1,8 @@ -MD5 (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = ba042a1a5b0bd32eaf534590d207e674 SHA256 (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 26d23ea8befdd6c97b4f3e7a1bb7e185c55020cf12a34ac2fee22ebfcd5bf72f SIZE (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 286347872 -MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 -MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2/gpc231.tar.Z) = 27917 -MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445 SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366 diff -ruNa editors.orig/openoffice.org-2/files/rtld-workaround-i66667 editors/openoffice.org-2/files/rtld-workaround-i66667 --- editors.orig/openoffice.org-2/files/rtld-workaround-i66667 2007-09-22 04:02:02.000000000 +0400 +++ editors/openoffice.org-2/files/rtld-workaround-i66667 1970-01-01 03:00:00.000000000 +0300 @@ -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 - - #include -+#include - - #if OSL_DEBUG_LEVEL > 1 - #include -@@ -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(); diff -ruNa editors.orig/openoffice.org-3/Makefile editors/openoffice.org-3/Makefile --- editors.orig/openoffice.org-3/Makefile 2011-01-30 14:10:32.000000000 +0300 +++ editors/openoffice.org-3/Makefile 2011-01-30 19:31:05.000000000 +0300 @@ -57,11 +57,7 @@ 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> @@ -158,10 +154,6 @@ 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 -ruNa editors.orig/openoffice.org-3/files/rtld-workaround-i66667 editors/openoffice.org-3/files/rtld-workaround-i66667 --- editors.orig/openoffice.org-3/files/rtld-workaround-i66667 2007-09-22 04:02:02.000000000 +0400 +++ editors/openoffice.org-3/files/rtld-workaround-i66667 1970-01-01 03:00:00.000000000 +0300 @@ -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 - - #include -+#include - - #if OSL_DEBUG_LEVEL > 1 - #include -@@ -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(); diff -ruNa editors.orig/openoffice.org-3-RC/Makefile editors/openoffice.org-3-RC/Makefile --- editors.orig/openoffice.org-3-RC/Makefile 2011-01-30 15:50:52.000000000 +0300 +++ editors/openoffice.org-3-RC/Makefile 2011-01-30 19:34:04.000000000 +0300 @@ -58,11 +58,7 @@ 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> @@ -161,10 +157,6 @@ 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 -ruNa editors.orig/openoffice.org-3-RC/files/rtld-workaround-i66667 editors/openoffice.org-3-RC/files/rtld-workaround-i66667 --- editors.orig/openoffice.org-3-RC/files/rtld-workaround-i66667 2007-08-16 01:06:21.000000000 +0400 +++ editors/openoffice.org-3-RC/files/rtld-workaround-i66667 1970-01-01 03:00:00.000000000 +0300 @@ -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 - - #include -+#include - - #if OSL_DEBUG_LEVEL > 1 - #include -@@ -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(); diff -ruNa editors.orig/openoffice.org-3-devel/Makefile editors/openoffice.org-3-devel/Makefile --- editors.orig/openoffice.org-3-devel/Makefile 2011-01-30 16:16:09.000000000 +0300 +++ editors/openoffice.org-3-devel/Makefile 2011-01-30 19:36:14.000000000 +0300 @@ -63,11 +63,7 @@ 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> @@ -166,10 +162,6 @@ 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 -ruNa editors.orig/openoffice.org-3-devel/files/rtld-workaround-i66667 editors/openoffice.org-3-devel/files/rtld-workaround-i66667 --- editors.orig/openoffice.org-3-devel/files/rtld-workaround-i66667 2007-01-05 07:19:23.000000000 +0300 +++ editors/openoffice.org-3-devel/files/rtld-workaround-i66667 1970-01-01 03:00:00.000000000 +0300 @@ -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 - - #include -+#include - - #if OSL_DEBUG_LEVEL > 1 - #include -@@ -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(); diff -ruNa editors.orig/openoffice.org-vcltesttool/Makefile editors/openoffice.org-vcltesttool/Makefile --- editors.orig/openoffice.org-vcltesttool/Makefile 2010-04-01 04:48:45.000000000 +0400 +++ editors/openoffice.org-vcltesttool/Makefile 2011-01-30 19:37:53.000000000 +0300 @@ -35,11 +35,7 @@ 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 ONLY_FOR_ARCHS= i386 amd64 diff -ruNa editors.orig/openoffice.org-vcltesttool/distinfo editors/openoffice.org-vcltesttool/distinfo --- editors.orig/openoffice.org-vcltesttool/distinfo 2009-07-22 13:53:44.000000000 +0400 +++ editors/openoffice.org-vcltesttool/distinfo 2011-01-30 19:39:17.000000000 +0300 @@ -1,6 +1,4 @@ -MD5 (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = e1d6ddd11e60a9b0365b8297f494dbae SHA256 (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = b15ed4055b41a87d1d1670348433b8bd1c5f5c350ae453d57e942413a8cc10d0 SIZE (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = 298993416 -MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff -ruNa editors.orig/openoffice.org-vcltesttool/files/rtld-workaround-i66667 editors/openoffice.org-vcltesttool/files/rtld-workaround-i66667 --- editors.orig/openoffice.org-vcltesttool/files/rtld-workaround-i66667 2007-01-05 07:19:23.000000000 +0300 +++ editors/openoffice.org-vcltesttool/files/rtld-workaround-i66667 1970-01-01 03:00:00.000000000 +0300 @@ -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 - - #include -+#include - - #if OSL_DEBUG_LEVEL > 1 - #include -@@ -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();