View | Details | Raw Unified | Return to bug 154396
Collapse All | Expand All

(-)editors/openoffice.org-2/Makefile (-7 lines)
Lines 53-63 Link Here
53
USE_JAVA=	yes
53
USE_JAVA=	yes
54
JAVA_BUILD=	jdk
54
JAVA_BUILD=	jdk
55
JAVA_VENDOR=	freebsd bsdjava openjdk
55
JAVA_VENDOR=	freebsd bsdjava openjdk
56
.if (${OSVERSION} >= 700000)
57
JAVA_VERSION=	1.5 1.6
56
JAVA_VERSION=	1.5 1.6
58
.else
59
JAVA_VERSION=	1.4 1.5 1.6
60
.endif
61
57
62
.include <${FILESDIR}/Makefile.localized>
58
.include <${FILESDIR}/Makefile.localized>
63
59
Lines 138-146 Link Here
138
.if ${ARCH} == amd64
134
.if ${ARCH} == amd64
139
WITHOUT_MOZILLA=	yes
135
WITHOUT_MOZILLA=	yes
140
.endif
136
.endif
141
.if (${OSVERSION} <= 602102)
142
EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
143
.endif
144
.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
137
.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
145
EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
138
EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
146
.endif
139
.endif
(-)editors/openoffice.org-2/distinfo (-4 lines)
Lines 1-12 Link Here
1
MD5 (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = ba042a1a5b0bd32eaf534590d207e674
2
SHA256 (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 26d23ea8befdd6c97b4f3e7a1bb7e185c55020cf12a34ac2fee22ebfcd5bf72f
1
SHA256 (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 26d23ea8befdd6c97b4f3e7a1bb7e185c55020cf12a34ac2fee22ebfcd5bf72f
3
SIZE (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 286347872
2
SIZE (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 286347872
4
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
5
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
3
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
6
SIZE (openoffice.org2/unowinreg.dll) = 6144
4
SIZE (openoffice.org2/unowinreg.dll) = 6144
7
MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
8
SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
5
SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
9
SIZE (openoffice.org2/gpc231.tar.Z) = 27917
6
SIZE (openoffice.org2/gpc231.tar.Z) = 27917
10
MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
11
SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
7
SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
12
SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
8
SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
(-)editors/openoffice.org-2/files/rtld-workaround-i66667 (-55 lines)
Lines 1-55 Link Here
1
Index: vcl/unx/gtk/app/gtkinst.cxx
2
===================================================================
3
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
4
retrieving revision 1.14
5
diff -u -r1.14 gtkinst.cxx
6
--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
7
+++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
8
@@ -43,6 +43,7 @@
9
 #include <plugins/gtk/atkbridge.hxx>
10
 
11
 #include <rtl/strbuf.hxx>
12
+#include <rtl/ustrbuf.hxx>
13
 
14
 #if OSL_DEBUG_LEVEL > 1
15
 #include <stdio.h>
16
@@ -111,13 +112,27 @@
17
 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
18
 		pYieldMutex->ThreadsLeave();
19
 	}
20
-	static bool hookLocks( oslModule pModule )
21
+	static bool hookLocks( void )
22
 	{
23
-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
24
+		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
25
 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
26
 
27
+		/* XXX GDK library path should be set by configure. */
28
+		OUStringBuffer aModName( 128 );
29
+		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
30
+		aModName.appendAscii( SAL_DLLEXTENSION );
31
+		OUString aModule = aModName.makeStringAndClear();
32
+		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
33
+
34
+		if ( !aMod )
35
+		{
36
+#if OSL_DEBUG_LEVEL > 1
37
+		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
38
+#endif
39
+			return false;
40
+		}
41
 		GdkLockFn gdk_threads_set_lock_functions =
42
-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
43
+				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
44
 		if ( !gdk_threads_set_lock_functions )
45
 		{
46
 #if OSL_DEBUG_LEVEL > 1
47
@@ -150,7 +165,7 @@
48
 		if ( !g_thread_supported() )
49
 			g_thread_init( NULL );
50
 
51
-		if ( hookLocks( pModule ) )
52
+		if ( hookLocks() )
53
 			pYieldMutex = new GtkHookedYieldMutex();
54
 		else
55
 			pYieldMutex = new GtkYieldMutex();
(-)editors/openoffice.org-3/Makefile (-8 lines)
Lines 57-67 Link Here
57
USE_JAVA=	yes
57
USE_JAVA=	yes
58
JAVA_BUILD=	jdk
58
JAVA_BUILD=	jdk
59
JAVA_VENDOR=	freebsd bsdjava openjdk
59
JAVA_VENDOR=	freebsd bsdjava openjdk
60
.if (${OSVERSION} >= 700000)
61
JAVA_VERSION=	1.5 1.6
60
JAVA_VERSION=	1.5 1.6
62
.else
63
JAVA_VERSION=	1.4 1.5 1.6
64
.endif
65
61
66
.include <${FILESDIR}/Makefile.localized>
62
.include <${FILESDIR}/Makefile.localized>
67
63
Lines 158-167 Link Here
158
OOOEXTENSIONS+=		swext/wiki-publisher.oxt
154
OOOEXTENSIONS+=		swext/wiki-publisher.oxt
159
OOOEXTENSIONS+=		report-builder.oxt
155
OOOEXTENSIONS+=		report-builder.oxt
160
156
161
.if (${OSVERSION} <= 602102)
162
EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
163
.endif
164
165
ICONS=	${WRKSRC}/sysui/desktop/icons
157
ICONS=	${WRKSRC}/sysui/desktop/icons
166
158
167
.include <${FILESDIR}/Makefile.knobs>
159
.include <${FILESDIR}/Makefile.knobs>
(-)editors/openoffice.org-3/files/rtld-workaround-i66667 (-55 lines)
Lines 1-55 Link Here
1
Index: vcl/unx/gtk/app/gtkinst.cxx
2
===================================================================
3
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
4
retrieving revision 1.14
5
diff -u -r1.14 gtkinst.cxx
6
--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
7
+++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
8
@@ -43,6 +43,7 @@
9
 #include <plugins/gtk/atkbridge.hxx>
10
 
11
 #include <rtl/strbuf.hxx>
12
+#include <rtl/ustrbuf.hxx>
13
 
14
 #if OSL_DEBUG_LEVEL > 1
15
 #include <stdio.h>
16
@@ -111,13 +112,27 @@
17
 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
18
 		pYieldMutex->ThreadsLeave();
19
 	}
20
-	static bool hookLocks( oslModule pModule )
21
+	static bool hookLocks( void )
22
 	{
23
-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
24
+		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
25
 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
26
 
27
+		/* XXX GDK library path should be set by configure. */
28
+		OUStringBuffer aModName( 128 );
29
+		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
30
+		aModName.appendAscii( SAL_DLLEXTENSION );
31
+		OUString aModule = aModName.makeStringAndClear();
32
+		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
33
+
34
+		if ( !aMod )
35
+		{
36
+#if OSL_DEBUG_LEVEL > 1
37
+		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
38
+#endif
39
+			return false;
40
+		}
41
 		GdkLockFn gdk_threads_set_lock_functions =
42
-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
43
+				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
44
 		if ( !gdk_threads_set_lock_functions )
45
 		{
46
 #if OSL_DEBUG_LEVEL > 1
47
@@ -150,7 +165,7 @@
48
 		if ( !g_thread_supported() )
49
 			g_thread_init( NULL );
50
 
51
-		if ( hookLocks( pModule ) )
52
+		if ( hookLocks() )
53
 			pYieldMutex = new GtkHookedYieldMutex();
54
 		else
55
 			pYieldMutex = new GtkYieldMutex();
(-)editors/openoffice.org-3-RC/Makefile (-8 lines)
Lines 58-68 Link Here
58
USE_JAVA=	yes
58
USE_JAVA=	yes
59
JAVA_BUILD=	jdk
59
JAVA_BUILD=	jdk
60
JAVA_VENDOR=	freebsd bsdjava openjdk
60
JAVA_VENDOR=	freebsd bsdjava openjdk
61
.if (${OSVERSION} >= 700000)
62
JAVA_VERSION=	1.5 1.6
61
JAVA_VERSION=	1.5 1.6
63
.else
64
JAVA_VERSION=	1.4 1.5 1.6
65
.endif
66
62
67
.include <${FILESDIR}/Makefile.localized>
63
.include <${FILESDIR}/Makefile.localized>
68
64
Lines 161-170 Link Here
161
OOOEXTENSIONS+=		swext/wiki-publisher.oxt
157
OOOEXTENSIONS+=		swext/wiki-publisher.oxt
162
OOOEXTENSIONS+=		report-builder.oxt
158
OOOEXTENSIONS+=		report-builder.oxt
163
159
164
.if (${OSVERSION} <= 602102)
165
EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
166
.endif
167
168
ICONS=	${WRKSRC}/sysui/desktop/icons
160
ICONS=	${WRKSRC}/sysui/desktop/icons
169
161
170
.include <${FILESDIR}/Makefile.knobs>
162
.include <${FILESDIR}/Makefile.knobs>
(-)editors/openoffice.org-3-RC/files/rtld-workaround-i66667 (-55 lines)
Lines 1-55 Link Here
1
Index: vcl/unx/gtk/app/gtkinst.cxx
2
===================================================================
3
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
4
retrieving revision 1.14
5
diff -u -r1.14 gtkinst.cxx
6
--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
7
+++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
8
@@ -43,6 +43,7 @@
9
 #include <plugins/gtk/atkbridge.hxx>
10
 
11
 #include <rtl/strbuf.hxx>
12
+#include <rtl/ustrbuf.hxx>
13
 
14
 #if OSL_DEBUG_LEVEL > 1
15
 #include <stdio.h>
16
@@ -111,13 +112,27 @@
17
 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
18
 		pYieldMutex->ThreadsLeave();
19
 	}
20
-	static bool hookLocks( oslModule pModule )
21
+	static bool hookLocks( void )
22
 	{
23
-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
24
+		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
25
 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
26
 
27
+		/* XXX GDK library path should be set by configure. */
28
+		OUStringBuffer aModName( 128 );
29
+		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
30
+		aModName.appendAscii( SAL_DLLEXTENSION );
31
+		OUString aModule = aModName.makeStringAndClear();
32
+		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
33
+
34
+		if ( !aMod )
35
+		{
36
+#if OSL_DEBUG_LEVEL > 1
37
+		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
38
+#endif
39
+			return false;
40
+		}
41
 		GdkLockFn gdk_threads_set_lock_functions =
42
-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
43
+				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
44
 		if ( !gdk_threads_set_lock_functions )
45
 		{
46
 #if OSL_DEBUG_LEVEL > 1
47
@@ -150,7 +165,7 @@
48
 		if ( !g_thread_supported() )
49
 			g_thread_init( NULL );
50
 
51
-		if ( hookLocks( pModule ) )
52
+		if ( hookLocks() )
53
 			pYieldMutex = new GtkHookedYieldMutex();
54
 		else
55
 			pYieldMutex = new GtkYieldMutex();
(-)editors/openoffice.org-3-devel/Makefile (-8 lines)
Lines 63-73 Link Here
63
USE_JAVA=	yes
63
USE_JAVA=	yes
64
JAVA_BUILD=	jdk
64
JAVA_BUILD=	jdk
65
JAVA_VENDOR=	freebsd bsdjava openjdk
65
JAVA_VENDOR=	freebsd bsdjava openjdk
66
.if (${OSVERSION} >= 700000)
67
JAVA_VERSION=	1.5 1.6
66
JAVA_VERSION=	1.5 1.6
68
.else
69
JAVA_VERSION=	1.4 1.5 1.6
70
.endif
71
67
72
.include <${FILESDIR}/Makefile.localized>
68
.include <${FILESDIR}/Makefile.localized>
73
69
Lines 166-175 Link Here
166
OOOEXTENSIONS+=		swext/wiki-publisher.oxt
162
OOOEXTENSIONS+=		swext/wiki-publisher.oxt
167
OOOEXTENSIONS+=		report-builder.oxt
163
OOOEXTENSIONS+=		report-builder.oxt
168
164
169
.if (${OSVERSION} <= 602102)
170
EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
171
.endif
172
173
ICONS=	${WRKSRC}/sysui/desktop/icons
165
ICONS=	${WRKSRC}/sysui/desktop/icons
174
166
175
.include <${FILESDIR}/Makefile.knobs>
167
.include <${FILESDIR}/Makefile.knobs>
(-)editors/openoffice.org-3-devel/files/rtld-workaround-i66667 (-55 lines)
Lines 1-55 Link Here
1
Index: vcl/unx/gtk/app/gtkinst.cxx
2
===================================================================
3
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
4
retrieving revision 1.14
5
diff -u -r1.14 gtkinst.cxx
6
--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
7
+++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
8
@@ -43,6 +43,7 @@
9
 #include <plugins/gtk/atkbridge.hxx>
10
 
11
 #include <rtl/strbuf.hxx>
12
+#include <rtl/ustrbuf.hxx>
13
 
14
 #if OSL_DEBUG_LEVEL > 1
15
 #include <stdio.h>
16
@@ -111,13 +112,27 @@
17
 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
18
 		pYieldMutex->ThreadsLeave();
19
 	}
20
-	static bool hookLocks( oslModule pModule )
21
+	static bool hookLocks( void )
22
 	{
23
-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
24
+		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
25
 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
26
 
27
+		/* XXX GDK library path should be set by configure. */
28
+		OUStringBuffer aModName( 128 );
29
+		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
30
+		aModName.appendAscii( SAL_DLLEXTENSION );
31
+		OUString aModule = aModName.makeStringAndClear();
32
+		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
33
+
34
+		if ( !aMod )
35
+		{
36
+#if OSL_DEBUG_LEVEL > 1
37
+		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
38
+#endif
39
+			return false;
40
+		}
41
 		GdkLockFn gdk_threads_set_lock_functions =
42
-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
43
+				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
44
 		if ( !gdk_threads_set_lock_functions )
45
 		{
46
 #if OSL_DEBUG_LEVEL > 1
47
@@ -150,7 +165,7 @@
48
 		if ( !g_thread_supported() )
49
 			g_thread_init( NULL );
50
 
51
-		if ( hookLocks( pModule ) )
52
+		if ( hookLocks() )
53
 			pYieldMutex = new GtkHookedYieldMutex();
54
 		else
55
 			pYieldMutex = new GtkYieldMutex();
(-)editors/openoffice.org-vcltesttool/Makefile (-4 lines)
Lines 35-45 Link Here
35
USE_JAVA=	yes
35
USE_JAVA=	yes
36
JAVA_BUILD=	jdk
36
JAVA_BUILD=	jdk
37
JAVA_VENDOR=	freebsd bsdjava openjdk
37
JAVA_VENDOR=	freebsd bsdjava openjdk
38
.if (${OSVERSION} >= 700000)
39
JAVA_VERSION=	1.5 1.6
38
JAVA_VERSION=	1.5 1.6
40
.else
41
JAVA_VERSION=	1.4 1.5 1.6
42
.endif
43
39
44
ONLY_FOR_ARCHS=	i386 amd64
40
ONLY_FOR_ARCHS=	i386 amd64
45
41
(-)editors/openoffice.org-vcltesttool/distinfo (-2 lines)
Lines 1-6 Link Here
1
MD5 (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = e1d6ddd11e60a9b0365b8297f494dbae
2
SHA256 (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = b15ed4055b41a87d1d1670348433b8bd1c5f5c350ae453d57e942413a8cc10d0
1
SHA256 (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = b15ed4055b41a87d1d1670348433b8bd1c5f5c350ae453d57e942413a8cc10d0
3
SIZE (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = 298993416
2
SIZE (openoffice.org2/OOo_SRC680_m248_source.tar.bz2) = 298993416
4
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
5
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
3
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
6
SIZE (openoffice.org2/unowinreg.dll) = 6144
4
SIZE (openoffice.org2/unowinreg.dll) = 6144
(-)editors/openoffice.org-vcltesttool/files/rtld-workaround-i66667 (-55 lines)
Lines 1-55 Link Here
1
Index: vcl/unx/gtk/app/gtkinst.cxx
2
===================================================================
3
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
4
retrieving revision 1.14
5
diff -u -r1.14 gtkinst.cxx
6
--- vcl/unx/gtk/app/gtkinst.cxx	19 Jun 2006 19:44:33 -0000	1.14
7
+++ vcl/unx/gtk/app/gtkinst.cxx	27 Jun 2006 02:11:09 -0000
8
@@ -43,6 +43,7 @@
9
 #include <plugins/gtk/atkbridge.hxx>
10
 
11
 #include <rtl/strbuf.hxx>
12
+#include <rtl/ustrbuf.hxx>
13
 
14
 #if OSL_DEBUG_LEVEL > 1
15
 #include <stdio.h>
16
@@ -111,13 +112,27 @@
17
 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
18
 		pYieldMutex->ThreadsLeave();
19
 	}
20
-	static bool hookLocks( oslModule pModule )
21
+	static bool hookLocks( void )
22
 	{
23
-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
24
+		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
25
 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
26
 
27
+		/* XXX GDK library path should be set by configure. */
28
+		OUStringBuffer aModName( 128 );
29
+		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
30
+		aModName.appendAscii( SAL_DLLEXTENSION );
31
+		OUString aModule = aModName.makeStringAndClear();
32
+		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
33
+
34
+		if ( !aMod )
35
+		{
36
+#if OSL_DEBUG_LEVEL > 1
37
+		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
38
+#endif
39
+			return false;
40
+		}
41
 		GdkLockFn gdk_threads_set_lock_functions =
42
-				(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
43
+				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
44
 		if ( !gdk_threads_set_lock_functions )
45
 		{
46
 #if OSL_DEBUG_LEVEL > 1
47
@@ -150,7 +165,7 @@
48
 		if ( !g_thread_supported() )
49
 			g_thread_init( NULL );
50
 
51
-		if ( hookLocks( pModule ) )
52
+		if ( hookLocks() )
53
 			pYieldMutex = new GtkHookedYieldMutex();
54
 		else
55
 			pYieldMutex = new GtkYieldMutex();

Return to bug 154396