diff options
| author | George V. Neville-Neil <gnn@FreeBSD.org> | 2013-08-14 14:52:22 +0000 |
|---|---|---|
| committer | George V. Neville-Neil <gnn@FreeBSD.org> | 2013-08-14 14:52:22 +0000 |
| commit | ed1693190e998658e9b5a9efde5b7c0fa2fde607 (patch) | |
| tree | 3d081ce0c87edb95fc1e0670332ab14debff4a7e /java | |
| parent | Update to 6.9.1 (diff) | |
Fix for broken eclipse-devel after glib-2.36.3 update.
Tested on HEAD, 9.1 and 8.4.
PR: ports/181124
Submitted by: Jonathan Chen jonc at chen.org.nz
Notes
Notes:
svn path=/head/; revision=324728
Diffstat (limited to 'java')
| -rw-r--r-- | java/eclipse-devel/files/freebsd-support.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/java/eclipse-devel/files/freebsd-support.patch b/java/eclipse-devel/files/freebsd-support.patch index 8de2ab81cb04..34b2627684f7 100644 --- a/java/eclipse-devel/files/freebsd-support.patch +++ b/java/eclipse-devel/files/freebsd-support.patch @@ -2827,6 +2827,40 @@ $FreeBSD$ # GLX lib # make_glx: $(GLX_LIB) +--- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h.orig 2012-06-28 01:39:42.000000000 +1200 ++++ build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h 2013-08-08 09:17:59.133694911 +1200 +@@ -38,6 +38,11 @@ + + #define OS_LOAD_FUNCTION LOAD_FUNCTION + ++/* ++ g_thread_init() is non-existent in glib-2.36+ ++ */ ++#define NO__1g_1thread_1init ++ + #ifndef GDK_WINDOWING_X11 + + /* X Structures */ +--- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c.orig 2013-08-08 09:18:14.525694799 +1200 ++++ build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c 2013-08-08 09:19:42.847695428 +1200 +@@ -4434,11 +4434,17 @@ + JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported) + (JNIEnv *env, jclass that) + { ++ return 1; ++ /* ++ g_thread_supported is non-existent in glib-2.36+, ++ but is still referenced. ++ + jboolean rc = 0; + OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC); + rc = (jboolean)g_thread_supported(); + OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC); + return rc; ++ */ + } + #endif + --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2009-12-23 15:12:33.298742157 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2009-12-23 15:14:12.577551971 -0500 @@ -23,18 +23,19 @@ |