webkit-gtk 1.4 patch

swt-3.6.2-webkit.patch (text/plain), 1.99 KB, created by hubertstar on 2011-06-21 18:14:41 UTC

diff -aur a/make_linux.mak b/make_linux.mak
--- a/make_linux.mak	2011-02-10 17:29:10.000000000 +0800
+++ b/make_linux.mak	2011-06-22 02:02:23.725001689 +0800
@@ -91,8 +91,8 @@
 	-DNO_nsDynamicFunctionLoad
 XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
 
-WEBKITCFLAGS = `pkg-config --cflags gtk+-2.0` -I/usr/include/webkit-1.0 -I/usr/include/libsoup-2.4
-WEBKITLIBS = -lwebkit-1.0
+WEBKITCFLAGS = `pkg-config --cflags webkit-1.0`
+WEBKITLIBS = -lwebkitgtk-1.0
 
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
diff -aur a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java
--- a/org/eclipse/swt/browser/WebKit.java	2011-02-10 17:29:10.000000000 +0800
+++ b/org/eclipse/swt/browser/WebKit.java	2011-06-22 01:51:31.805001368 +0800
@@ -88,12 +88,22 @@
 	static Callback Proc2, Proc3, Proc4, Proc5, Proc6;
 	static Callback JSObjectHasPropertyProc, JSObjectGetPropertyProc, JSObjectCallAsFunctionProc;
 
-	static {
+ 	static {
+
+		/*
+		* WebKitGTK is binary-incompatible between its 1.2 and 1.4 releases,
+		* so swt has separate libraries compiled against each.
+		*/
 		try {
-			Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$
-			LibraryLoaded = true;
-		} catch (Throwable e) {
-		}
+			Library.loadLibrary ("swt-webkit12"); // $NON-NLS-1$
+ 			LibraryLoaded = true;
+ 		} catch (Throwable e) {
+			try {
+				Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$
+				LibraryLoaded = true;
+			} catch (Throwable e2) {
+			}
+ 		}
 
 		Proc2 = new Callback (WebKit.class, "Proc", 2); //$NON-NLS-1$
 		if (Proc2.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
diff -aur a/webkitgtk.h b/webkitgtk.h
--- a/webkitgtk.h	2011-02-10 17:29:10.000000000 +0800
+++ b/webkitgtk.h	2011-06-22 01:50:08.933001343 +0800
@@ -31,4 +31,7 @@
 #include <webkit/webkitwebpolicydecision.h>
 #include <webkit/webkitwebsettings.h>
 #include <webkit/webkitwebview.h>
+#if WEBKIT_CHECK_VERSION(1,4,0)
+#include <webkit/webkitglobals.h>
+#endif
 #endif /* INC_webkitgtk_H */