### Eclipse Workspace Patch 1.0
#P org.eclipse.swt.gtk.solaris.sparc
Index: build.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.gtk.solaris.sparc/build.xml,v
retrieving revision 1.37
diff -u -r1.37 build.xml
--- build.xml	4 May 2009 17:05:21 -0000	1.37
+++ build.xml	25 May 2009 19:14:32 -0000
@@ -127,6 +127,7 @@
 			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}" />
 			<fileset dir="${plugindir}/Eclipse SWT Program/gtk/" includes="${includes}" excludes="${excludes}" />
 			<fileset dir="${plugindir}/Eclipse SWT Theme/gtk/" includes="${includes}" excludes="${excludes}" />
+			<fileset dir="${plugindir}/components/" includes="${includes}" excludes="${excludes}" />
 		</copy>
 		<antcall target="copy.translationfiles" />
 
Index: buildLibraries.csh
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.gtk.solaris.sparc/buildLibraries.csh,v
retrieving revision 1.2
diff -u -r1.2 buildLibraries.csh
--- buildLibraries.csh	5 May 2009 20:40:03 -0000	1.2
+++ buildLibraries.csh	25 May 2009 19:14:32 -0000
@@ -5,11 +5,16 @@
 setenv CCPATH /export/home/SUNWspro/bin
 
 setenv CC cc
+setenv CXX CC
 setenv CDE_HOME /usr/dt
 setenv JAVA_HOME /usr/j2se
 setenv PATH ${CCPATH}:/usr/ccs/bin:/usr/local/bin:${PATH}
 setenv PKG_CONFIG_PATH ${CAIROPATH}
 
+setenv MOZILLA_SDK /bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk
+setenv MOZILLA_INCLUDES "-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include"
+setenv MOZILLA_LIBS "${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+
 cd ../org.eclipse.swt/bin/library/
 sh build.sh clean
-sh build.sh install
+sh build.sh make_mozilla install
Index: about.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.gtk.solaris.sparc/about.html,v
retrieving revision 1.9
diff -u -r1.9 about.html
--- about.html	6 Sep 2007 18:07:05 -0000	1.9
+++ about.html	25 May 2009 19:14:32 -0000
@@ -60,6 +60,37 @@
 governed by the terms and conditions of the LGPL.  Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
 work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
 
+<h4>Mozilla Binding</h4>
+
+<p>The &quot;Mozilla Binding&quot; is a binding to the Mozilla API.  The Content may include any or all of the following files:</p>
+
+<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
+<ul>
+	<li>libswt-mozilla-gtk-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
+</ul>
+
+<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
+<ul>
+	<li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
+</ul>
+
+<p>The Mozilla Binding contains portions of Mozilla (&quot;Mozilla&quot;).  Mozilla is made available by Mozilla.org.  Use of Mozilla is governed by the terms and
+conditions of the Mozilla Public License Version 1.1 (&quot;MPL&quot;).  A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
+<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
+
+<h4>XULRunner 1.9 (subset, derivative work)</h4>
+
+The library swt-mozilla-gtk-xxxx.dll (where &quot;xxxx&quot; is the version number) contains a small portion of XULRunner 1.9 content (header files)
+that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
+the terms and conditions of the Mozilla Public License Version 1.1 ("MPL").  A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
+and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
+<p>The changed files are:
+<ul>
+  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h</code>
+  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h</code>
+</ul>
+Changes to the original files were made by SWT on April 7, 2009 and are marked with trailing comment <em>&quot;//SWT-20090407&quot;</em>.
+
 <h4>Independent JPEG Group's JPEG software release 6b</h4>
 
 <p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b (&quot;LIBJPEG&quot;).
#P org.eclipse.swt
Index: Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java,v
retrieving revision 1.17
diff -u -r1.17 MozillaDelegate.java
--- Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java	6 May 2009 14:54:21 -0000	1.17
+++ Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java	25 May 2009 19:14:33 -0000
@@ -21,15 +21,16 @@
 	Listener listener;
 	boolean hasFocus;
 
-	static boolean GtkLoaded, IsLinux;
+	static boolean GtkLoaded, IsLinux, IsSolaris;
 	static {
 		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
 		IsLinux = osName.startsWith ("linux"); //$NON-NLS-1$
+		IsSolaris = osName.startsWith ("sunos") || osName.startsWith ("solaris"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 MozillaDelegate (Browser browser) {
 	super ();
-	if (!IsLinux) {
+	if (!(IsLinux || IsSolaris)) {
 		browser.dispose ();
 		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
 	}
Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java,v
retrieving revision 1.17
diff -u -r1.17 AppFileLocProvider.java
--- Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java	2 Dec 2008 20:32:30 -0000	1.17
+++ Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java	25 May 2009 19:14:33 -0000
@@ -33,6 +33,13 @@
 	static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
 	static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
 	static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
+
+	static boolean IsSparc;
+	static {
+		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
+		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
 	
 AppFileLocProvider (String path) {
 	mozillaPath = path + SEPARATOR_OS;
@@ -174,18 +181,28 @@
 						if (segment.length () > 0) segments.addElement (segment);
 					} while (end != -1);
 					int segmentsSize = segments.size ();
-					pluginDirs = new String [segmentsSize + 2];
+					pluginDirs = new String [segmentsSize + (IsSparc ? 1 : 2)];
 					for (index = 0; index < segmentsSize; index++) {
 						pluginDirs[index] = (String)segments.elementAt (index);
 					}
 				}
 			}
 			if (pluginDirs == null) {
-				pluginDirs = new String[2];
+				pluginDirs = new String[IsSparc ? 1 : 2];
 			}
 
 			/* set the next value to the GRE path + "plugins" */
-			pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
+
+			/*
+			* Bug on Solaris SPARC.  Attempting to start the java plug-in fails with an
+			* error indicating that PR_NewMonitor could not be found.  This is a well-
+			* known problem that many other apps have also encountered, with no
+			* resolution other than to remove this plug-in.  The Browser workaround is
+			* to not add the directory containing this plug-in to the plug-in search path. 
+			*/
+			if (!IsSparc) {
+				pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
+			}
 
 			/* set the next value to the home directory + "/.mozilla/plugins" */
 			pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
Index: Eclipse SWT PI/gtk/library/make_solaris.mak
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak,v
retrieving revision 1.16
diff -u -r1.16 make_solaris.mak
--- Eclipse SWT PI/gtk/library/make_solaris.mak	24 Nov 2008 21:34:54 -0000	1.16
+++ Eclipse SWT PI/gtk/library/make_solaris.mak	25 May 2009 19:14:33 -0000
@@ -24,7 +24,9 @@
 CAIRO_PREFIX = swt-cairo
 ATK_PREFIX = swt-atk
 GNOME_PREFIX = swt-gnome
-MOZILLA_PREFIX = swt-mozilla
+MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
+XULRUNNER_PREFIX = swt-xulrunner
+XPCOMINIT_PREFIX = swt-xpcominit
 GLX_PREFIX = swt-glx
 
 SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -35,6 +37,8 @@
 ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 
 CAIROCFLAGS = `pkg-config --cflags cairo`
@@ -61,26 +65,26 @@
 #NATIVE_STATS = -DNATIVE_STATS
 
 MOZILLACFLAGS = -O \
+	-DSWT_VERSION=$(SWT_VERSION) \
+	$(NATIVE_STATS) \
 	-DMOZILLA_STRICT_API=1 \
-	-fno-rtti \
-	-fno-exceptions \
-	-Wall \
-	-DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) \
-	-Wno-non-virtual-dtor \
-	-fPIC \
+	-KPIC \
+	+w \
 	-I. \
-	-I$(MOZILLA_SDK)	\
-	-include $(MOZILLA_SDK)/mozilla-config.h \
-	-I$(MOZILLA_SDK)/nspr/include \
-	-I$(MOZILLA_SDK)/xpcom/include \
-	-I$(MOZILLA_SDK)/string/include \
-	-I$(MOZILLA_SDK)/embed_base/include \
-	-I$(MOZILLA_SDK)/embedstring/include
-MOZILLALIBS = -G -s -Wl,--version-script=mozilla_exports -Bsymbolic \
-	-L$(MOZILLA_SDK)/embedstring/bin -lembedstring \
-	-L$(MOZILLA_SDK)/embed_base/bin -lembed_base_s \
-	-L$(MOZILLA_SDK)/xpcom/bin -lxpcomglue_s -lxpcom \
-	-L$(MOZILLA_SDK)/nspr/bin -lnspr4 -lplds4 -lplc4
+	-I$(JAVA_HOME)/include \
+	-I$(JAVA_HOME)/include/solaris \
+	${SWT_PTR_CFLAGS}
+MOZILLALIBS =  -G
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+	-DNO__1XPCOMGlueStartup \
+	-DNO__1XPCOMGlueLoadXULFunctions \
+	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
+	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
+	-DNO_nsDynamicFunctionLoad_1sizeof \
+	-DNO__1Call__IIIIII \
+	-DNO__1Call__JJJJJI \
+	-DNO_nsDynamicFunctionLoad
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
 
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
@@ -90,6 +94,8 @@
 ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
 GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
 MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
+XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
 CFLAGS = -O \
@@ -201,22 +207,59 @@
 #
 # Mozilla lib
 #
-make_mozilla:#$(MOZILLA_LIB)
+make_mozilla:$(MOZILLA_LIB)
 
 $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS)
+	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
 
 xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) -c xpcom.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
 
 xpcom_structs.o: xpcom_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) -c xpcom_structs.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
 	
 xpcom_custom.o: xpcom_custom.cpp
-	$(CXX) $(MOZILLACFLAGS) -c xpcom_custom.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
 
 xpcom_stats.o: xpcom_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) -c xpcom_stats.cpp	
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+
+#
+# XULRunner lib
+#
+make_xulrunner:$(XULRUNNER_LIB)
+
+$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+
+xpcomxul.o: xpcom.cpp
+	$(CXX) -o xpcomxul.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+
+xpcomxul_structs.o: xpcom_structs.cpp
+	$(CXX) -o xpcomxul_structs.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+	
+xpcomxul_custom.o: xpcom_custom.cpp
+	$(CXX) -o xpcomxul_custom.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+
+xpcomxul_stats.o: xpcom_stats.cpp
+	$(CXX) -o xpcomxul_stats.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+
+#
+# XPCOMInit lib
+#
+make_xpcominit:$(XPCOMINIT_LIB)
+
+$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+
+xpcominit.o: xpcominit.cpp
+	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+
+xpcominit_structs.o: xpcominit_structs.cpp
+	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
+	
+xpcominit_stats.o: xpcominit_stats.cpp
+	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
 
 #
 # GLX lib
Index: Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java,v
retrieving revision 1.19
diff -u -r1.19 MozillaDelegate.java
--- Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java	6 May 2009 14:54:21 -0000	1.19
+++ Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java	25 May 2009 19:14:33 -0000
@@ -26,19 +26,8 @@
 	static int /*long*/ eventProc;
 	static final int STOP_PROPOGATE = 1;
 
-	static boolean IsSparc;
-	static {
-		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
-		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
-		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$
-	}
-
 MozillaDelegate (Browser browser) {
 	super ();
-	if (IsSparc) {
-		browser.dispose ();
-		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
-	}
 	this.browser = browser;
 }
 
Index: Eclipse SWT PI/motif/library/make_solaris.mak
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/motif/library/make_solaris.mak,v
retrieving revision 1.31
diff -u -r1.31 make_solaris.mak
--- Eclipse SWT PI/motif/library/make_solaris.mak	23 Feb 2009 20:24:43 -0000	1.31
+++ Eclipse SWT PI/motif/library/make_solaris.mak	25 May 2009 19:14:33 -0000
@@ -44,12 +44,49 @@
 AWT_OBJS = swt_awt.o
 AWT_LIBS = -G -L$(JAVA_HOME)/jre/lib/sparc -ljawt
 
+GTK_PREFIX = swt-gtk
+GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+GTK_OBJS = swt.o gtk.o
+GTK_CFLAGS = `pkg-config --cflags gtk+-2.0`
+GTK_LIBS = -G `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0
+
 CAIRO_PREFIX = swt-cairo
 CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 CAIRO_OBJS = swt.o cairo.o cairo_structs.o cairo_stats.o
 CAIROCFLAGS = `pkg-config --cflags cairo`
 CAIRO_LIBS = -G `pkg-config --libs-only-L cairo` -lcairo
 
+MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
+MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
+XULRUNNER_PREFIX = swt-xulrunner
+XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
+XPCOMINIT_PREFIX = swt-xpcominit
+XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+MOZILLACFLAGS = -O \
+	-DSWT_VERSION=$(SWT_VERSION) \
+	$(NATIVE_STATS) \
+	-DMOZILLA_STRICT_API=1 \
+	-KPIC \
+	+w \
+	-I. \
+	-I$(JAVA_HOME)/include \
+	-I$(JAVA_HOME)/include/solaris \
+	${SWT_PTR_CFLAGS}
+MOZILLALIBS =  -G
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+	-DNO__1XPCOMGlueStartup \
+	-DNO__1XPCOMGlueLoadXULFunctions \
+	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
+	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
+	-DNO_nsDynamicFunctionLoad_1sizeof \
+	-DNO__1Call__IIIIII \
+	-DNO__1Call__JJJJJI \
+	-DNO_nsDynamicFunctionLoad
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
+
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
@@ -71,7 +108,7 @@
 	-I$(MOTIF_HOME)/include \
 	-I$(CDE_HOME)/include
 
-all: make_swt make_awt make_glx make_cde
+all: make_swt make_awt make_gtk make_glx make_cde
 
 make_swt: $(SWT_LIB)
 
@@ -100,6 +137,71 @@
 $(AWT_LIB): $(AWT_OBJS)
 	ld -o $@ $(AWT_OBJS) $(AWT_LIBS)
 
+make_gtk: $(GTK_LIB)
+
+$(GTK_LIB): $(GTK_OBJS)
+	ld -o $@ $(GTK_OBJS) $(GTK_LIBS)
+
+gtk.o: gtk.c
+	$(CC) $(GTK_CFLAGS) $(CFLAGS) -c gtk.c
+
+#
+# Mozilla lib
+#
+make_mozilla:$(MOZILLA_LIB)
+
+$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
+
+xpcom.o: xpcom.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+
+xpcom_structs.o: xpcom_structs.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
+	
+xpcom_custom.o: xpcom_custom.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
+
+xpcom_stats.o: xpcom_stats.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+
+#
+# XULRunner lib
+#
+make_xulrunner:$(XULRUNNER_LIB)
+
+$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+
+xpcomxul.o: xpcom.cpp
+	$(CXX) -o xpcomxul.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+
+xpcomxul_structs.o: xpcom_structs.cpp
+	$(CXX) -o xpcomxul_structs.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+	
+xpcomxul_custom.o: xpcom_custom.cpp
+	$(CXX) -o xpcomxul_custom.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+
+xpcomxul_stats.o: xpcom_stats.cpp
+	$(CXX) -o xpcomxul_stats.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+
+#
+# XPCOMInit lib
+#
+make_xpcominit:$(XPCOMINIT_LIB)
+
+$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+
+xpcominit.o: xpcominit.cpp
+	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+
+xpcominit_structs.o: xpcominit_structs.cpp
+	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
+	
+xpcominit_stats.o: xpcominit_stats.cpp
+	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
+
 make_glx: $(GLX_LIB)
 
 $(GLX_LIB): $(GLX_OBJS)
#P org.eclipse.swt.motif.solaris.sparc
Index: build.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.motif.solaris.sparc/build.xml,v
retrieving revision 1.40
diff -u -r1.40 build.xml
--- build.xml	4 May 2009 17:05:17 -0000	1.40
+++ build.xml	25 May 2009 19:14:34 -0000
@@ -143,6 +143,7 @@
 			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}" />
 			<fileset dir="${plugindir}/Eclipse SWT Program/motif/" includes="${includes}" excludes="${excludes}" />
 			<fileset dir="${plugindir}/Eclipse SWT Theme/emulated/" includes="${includes}" excludes="${excludes}" />
+			<fileset dir="${plugindir}/components/" includes="${includes}" excludes="${excludes}" />
 		</copy>
 		<antcall target="copy.translationfiles" />
 
Index: about.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.motif.solaris.sparc/about.html,v
retrieving revision 1.9
diff -u -r1.9 about.html
--- about.html	6 Sep 2007 18:07:06 -0000	1.9
+++ about.html	25 May 2009 19:14:34 -0000
@@ -31,6 +31,37 @@
 for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
 terms and conditions of use.</p>
 
+<h4>Mozilla Binding</h4>
+
+<p>The &quot;Mozilla Binding&quot; is a binding to the Mozilla API.  The Content may include any or all of the following files:</p>
+
+<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
+<ul>
+	<li>libswt-mozilla-motif-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
+</ul>
+
+<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
+<ul>
+	<li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
+</ul>
+
+<p>The Mozilla Binding contains portions of Mozilla (&quot;Mozilla&quot;).  Mozilla is made available by Mozilla.org.  Use of Mozilla is governed by the terms and
+conditions of the Mozilla Public License Version 1.1 (&quot;MPL&quot;).  A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
+<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
+
+<h4>XULRunner 1.9 (subset, derivative work)</h4>
+
+The library swt-mozilla-motif-xxxx.dll (where &quot;xxxx&quot; is the version number) contains a small portion of XULRunner 1.9 content (header files)
+that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
+the terms and conditions of the Mozilla Public License Version 1.1 ("MPL").  A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
+and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
+<p>The changed files are:
+<ul>
+  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h</code>
+  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h</code>
+</ul>
+Changes to the original files were made by SWT on April 7, 2009 and are marked with trailing comment <em>&quot;//SWT-20090407&quot;</em>.
+
 <h4>Independent JPEG Group's JPEG software release 6b</h4>
 
 <p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b (&quot;LIBJPEG&quot;).
Index: buildLibraries.csh
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.motif.solaris.sparc/buildLibraries.csh,v
retrieving revision 1.1
diff -u -r1.1 buildLibraries.csh
--- buildLibraries.csh	8 Nov 2007 22:27:05 -0000	1.1
+++ buildLibraries.csh	25 May 2009 19:14:34 -0000
@@ -5,7 +5,13 @@
 setenv PKG_CONFIG_PATH /usr/local/cairo-1.4.6/lib/pkgconfig/
 
 setenv PATH ${CCPATH}:/usr/ccs/bin:${PATH}
+setenv CC cc
+setenv CXX CC
+
+setenv MOZILLA_SDK /bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk
+setenv MOZILLA_INCLUDES "-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include"
+setenv MOZILLA_LIBS "${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"
 
 cd ../org.eclipse.swt/bin/library/
 sh build.sh clean
-sh build.sh install
+sh build.sh make_mozilla install