diff options
author | Grant Gayed <ggayed> | 2011-05-09 16:09:27 +0000 |
---|---|---|
committer | Grant Gayed <ggayed> | 2011-05-09 16:09:27 +0000 |
commit | d05fd93fefebb6bc1d07ca12de432d36944a8740 (patch) | |
tree | 75f487a64c605ad27ba891e09826953cb5c3682e /bundles | |
parent | 1ce7a633cce3ad52167ecaa7460be2c6fa1c93e2 (diff) | |
download | eclipse.platform.swt-d05fd93fefebb6bc1d07ca12de432d36944a8740.tar.gz eclipse.platform.swt-d05fd93fefebb6bc1d07ca12de432d36944a8740.tar.xz eclipse.platform.swt-d05fd93fefebb6bc1d07ca12de432d36944a8740.zip |
343454 - XULRunner 2.0 kills Eclipse when opening anything Browser relatedBEFORE_JAVADOC_BASH_FOR_37RC1
Diffstat (limited to 'bundles')
4 files changed, 21 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak index 7a744fe0e3..84e463a8d7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak @@ -91,7 +91,7 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -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 +WEBKITCFLAGS = `pkg-config --cflags webkit-1.0` WEBKITLIBS = `pkg-config --libs webkit-1.0` SWT_OBJECTS = swt.o c.o c_stats.o callback.o diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h index 05b9a2eaa3..96271e39d7 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h @@ -31,4 +31,9 @@ #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 */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index 9a9ee3c0e6..784b4478e3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -89,10 +89,20 @@ class WebKit extends WebBrowser { static Callback JSObjectHasPropertyProc, JSObjectGetPropertyProc, JSObjectCallAsFunctionProc; 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$ + 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) { + } } if (LibraryLoaded) { diff --git a/bundles/org.eclipse.swt/tasks/build.xml b/bundles/org.eclipse.swt/tasks/build.xml index 40e6100db5..46d5bd3716 100644 --- a/bundles/org.eclipse.swt/tasks/build.xml +++ b/bundles/org.eclipse.swt/tasks/build.xml @@ -170,7 +170,7 @@ <env key="MOZILLA_LIBS" value="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"/> <env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/> <env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/> - <env key="PKG_CONFIG_PATH" value="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86_64/lib/pkgconfig"/> + <env key="PKG_CONFIG_PATH" value="/usr/lib64/pkgconfig:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86_64/lib/pkgconfig"/> <arg line="${targets}"/> <arg line="${clean}"/> </exec> @@ -566,11 +566,11 @@ <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="11"/> + <param name="library_count" value="12"/> <param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="11"/> + <param name="library_count" value="12"/> <param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/> </antcall> <antcall target="check_fragment_libraries"> @@ -628,7 +628,7 @@ Motif not built org.eclipse.swt.motif.linux.x86 org.eclipse.swt.motif.aix.ppc org.eclipse.swt.motif.hpux.ia64_32 org.eclipse.swt.motif.solaris.sparc --> - <property name="library_count" value="122"/> + <property name="library_count" value="124"/> <property name="fragment" value="org.eclipse.swt.win32.win32.x86 org.eclipse.swt.win32.win32.x86_64 org.eclipse.swt.win32.win32.ia64 org.eclipse.swt.win32.wce_ppc.arm org.eclipse.swt.carbon.macosx org.eclipse.swt.cocoa.macosx org.eclipse.swt.cocoa.macosx.x86_64 org.eclipse.swt.gtk.linux.ppc org.eclipse.swt.gtk.linux.ppc64 org.eclipse.swt.gtk.linux.x86 org.eclipse.swt.gtk.linux.x86_64 org.eclipse.swt.gtk.linux.s390 org.eclipse.swt.gtk.linux.s390x org.eclipse.swt.gtk.aix.ppc org.eclipse.swt.gtk.aix.ppc64 org.eclipse.swt.gtk.solaris.sparc org.eclipse.swt.gtk.solaris.x86 org.eclipse.swt.gtk.hpux.ia64_32"/> <sshexec host="${m_linux_x86}" username="swtbuild" |