|
Lines 2827-2832
Link Here
|
| 2827 |
# GLX lib |
2827 |
# GLX lib |
| 2828 |
# |
2828 |
# |
| 2829 |
make_glx: $(GLX_LIB) |
2829 |
make_glx: $(GLX_LIB) |
|
|
2830 |
--- 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 |
| 2831 |
+++ 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 |
| 2832 |
@@ -38,6 +38,11 @@ |
| 2833 |
|
| 2834 |
#define OS_LOAD_FUNCTION LOAD_FUNCTION |
| 2835 |
|
| 2836 |
+/* |
| 2837 |
+ g_thread_init() is non-existent in glib-2.36+ |
| 2838 |
+ */ |
| 2839 |
+#define NO__1g_1thread_1init |
| 2840 |
+ |
| 2841 |
#ifndef GDK_WINDOWING_X11 |
| 2842 |
|
| 2843 |
/* X Structures */ |
| 2844 |
--- 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 |
| 2845 |
+++ 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 |
| 2846 |
@@ -4434,11 +4434,17 @@ |
| 2847 |
JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported) |
| 2848 |
(JNIEnv *env, jclass that) |
| 2849 |
{ |
| 2850 |
+ return 1; |
| 2851 |
+ /* |
| 2852 |
+ g_thread_supported is non-existent in glib-2.36+, |
| 2853 |
+ but is still referenced. |
| 2854 |
+ |
| 2855 |
jboolean rc = 0; |
| 2856 |
OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC); |
| 2857 |
rc = (jboolean)g_thread_supported(); |
| 2858 |
OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC); |
| 2859 |
return rc; |
| 2860 |
+ */ |
| 2861 |
} |
| 2862 |
#endif |
| 2863 |
|
| 2830 |
--- 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 |
2864 |
--- 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 |
| 2831 |
+++ 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 |
2865 |
+++ 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 |
| 2832 |
@@ -23,18 +23,19 @@ |
2866 |
@@ -23,18 +23,19 @@ |