Attachment #72670 for bug #105581

Lines 2-13 Link Here

(-)eclipse/Makefile (-20 / +37 lines)
2	# Date created: March 7, 2003	2	# Date created: March 7, 2003
3	# Whom: various members of freebsd-java	3	# Whom: various members of freebsd-java
4	#	4	#
5	# $FreeBSD: ports/java/eclipse/Makefile,v 1.50 2006/11/04 02:06:49 kan Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= eclipse	8	PORTNAME= eclipse
9	PORTVERSION= 3.2.1	9	PORTVERSION= 3.2.1
10	#PORTREVISION= 0	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_ECLIPSE}	12	MASTER_SITES= ${MASTER_SITE_ECLIPSE}
13	MASTER_SITE_SUBDIR= R-${PORTVERSION}-200609210945	13	MASTER_SITE_SUBDIR= R-${PORTVERSION}-200609210945
Lines 27-32 Link Here
27	USE_ZIP= yes	27	USE_ZIP= yes
28	USE_GCC= 3.4+	28	USE_GCC= 3.4+
29		29
		30	.if !defined(WITHOUT_MOZILLA)
		31	USE_GECKO= xulrunner firefox mozilla seamonkey
		32	.endif
		33
30	USE_JAVA= yes	34	USE_JAVA= yes
31	JAVA_VERSION= 1.5+	35	JAVA_VERSION= 1.5+
32	JAVA_OS= native	36	JAVA_OS= native
Lines 39-73 Link Here
39		43
40	ECLIPSE_WS= gtk	44	ECLIPSE_WS= gtk
41		45
42	.if !defined(WITHOUT_MOZILLA)	46	.if defined(WITHOUT_GNOMEVFS)
43	MAKE_MOZILLA= make_mozilla	47	MAKE_GNOME=
44	.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla"	48	USE_GNOME= gtk20 pkgconfig desktopfileutils
45	BROWSER= ${WITH_MOZILLA}
46	BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}
47	.else	49	.else
48	BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla	50	MAKE_GNOME= make_gnome
49	BROWSER= mozilla	51	USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils
50	.endif	52	.endif
		53
		54
		55	.include <bsd.port.pre.mk>
		56
		57	.if !defined(WITHOUT_MOZILLA)
		58	MAKE_MOZILLA= make_mozilla
		59	BROWSER= ${GECKO}
51	.else	60	.else
52	BROWSER=	61	BROWSER=
53	MAKE_MOZILLA=	62	MAKE_MOZILLA=
54	.endif	63	.endif
		64
55	.if defined(WITHOUT_CAIRO)	65	.if defined(WITHOUT_CAIRO)
56	MAKE_CAIRO=	66	MAKE_CAIRO=
57	.else	67	.else
58	LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo	68	LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
59	MAKE_CAIRO= make_cairo	69	MAKE_CAIRO= make_cairo
60	.endif	70	.endif
61		71
62	.if defined(WITHOUT_GNOMEVFS)
63	MAKE_GNOME=
64	USE_GNOME= gtk20 pkgconfig desktopfileutils
65	.else
66	MAKE_GNOME= make_gnome
67	USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils
68	.endif
69
70	.include <bsd.port.pre.mk>
71		72
72	.if (${ARCH} == "amd64")	73	.if (${ARCH} == "amd64")
73	ECLIPSE_ARCH= amd64	74	ECLIPSE_ARCH= amd64
Lines 91-102 Link Here
91		92
92	SWTCAIRO=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library	93	SWTCAIRO=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library
93	SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library	94	SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library
		95	SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla
94		96
95	# Manually patch some files with spaces in the path	97	# Manually patch some files with spaces in the path
96	post-patch:	98	post-patch:
97	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh	99	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh
98	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak	100	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak
99	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" ${FILESDIR}/post-patch-plugins-swt-gtk-os_custom.h	101	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" ${FILESDIR}/post-patch-plugins-swt-gtk-os_custom.h
		102	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/Browser.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-Browser.java
		103	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/org/eclipse/swt/internal/mozilla/XPCOM.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.java
		104	@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.properties
		105	@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM_PROFILE.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM_PROFILE.properties
		106	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom.cpp" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom.cpp
		107	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom.h
		108	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_profile.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_profile.h
		109	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_stats.cpp" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_stats.cpp
		110	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_stats.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_stats.h
		111	@${REINPLACE_CMD} -e 's\|%%GECKO%%\|${GECKO}\|g' \
		112	"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" \
		113	"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak"
100		114
101	do-build:	115	do-build:
102	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \	116	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
Lines 109-114 Link Here
109	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \	123	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
110	-e "s+%%PREFIX%%+${PREFIX}+g" \	124	-e "s+%%PREFIX%%+${PREFIX}+g" \
111	-e "s+%%X11BASE%%+${X11BASE}+g" \	125	-e "s+%%X11BASE%%+${X11BASE}+g" \
		126	-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
112	-e "s+%%BROWSER%%+${BROWSER}+g" \	127	-e "s+%%BROWSER%%+${BROWSER}+g" \
113	-e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \	128	-e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
114	-e "s+%%JAVA_OS%%+${JAVA_OS}+g" \	129	-e "s+%%JAVA_OS%%+${JAVA_OS}+g" \
Lines 118-123 Link Here
118	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \	133	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
119	-e "s+%%PREFIX%%+${PREFIX}+g" \	134	-e "s+%%PREFIX%%+${PREFIX}+g" \
120	${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp	135	${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp
		136	${MKDIR} ${PREFIX}/share/applications/ \|\| ${TRUE}
121	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop	137	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop
122	${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse	138	${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse
123	@-update-desktop-database	139	@-update-desktop-database
Lines 127-130 Link Here
127	\| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}	143	\| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
128	@echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null \|\| /usr/bin/true' >> ${TMPPLIST}	144	@echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null \|\| /usr/bin/true' >> ${TMPPLIST}
129		145
		146	.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
130	.include <bsd.port.post.mk>	147	.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)eclipse/distinfo (-1 lines)
1	MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 0fe89e9c7cf07a56c4fe8e2d7f5a394b	1	MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 0fe89e9c7cf07a56c4fe8e2d7f5a394b
2	SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7	2	SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7
3	SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 82433420	3	SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 82433420
4




#
# See: http://www.eclipse.org
#
# $FreeBSD$
#

DEFAULT_JAVA_HOME=%%PREFIX%%
ECLIPSE_HOME=%%ECLIPSE_HOME%%
DEFAULT_JAVA_CMD=java
MOZILLA_FIVE_HOME=%%LOCALBASE%%/lib/%%BROWSER%%
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
export MOZILLA_FIVE_HOME LD_LIBRARY_PATH

#-----------------------------------------------------------------------------
# Determine configuration settings




--- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig	Mon Dec 11 01:10:05 2006
+++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml	Mon Dec 11 01:20:33 2006
@@ -39,18 +39,17 @@
 
 	<target name="properties" if="eclipse.running">
 		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-		<!--compile the jar in org.eclipse.swt.tools-->
 	</target>
 
 	<target name="build.update.jar" depends="init">
-		<delete dir="${temp.folder}"/>
+		<!-- <delete dir="${temp.folder}"/>
 		<mkdir dir="${temp.folder}"/>
 		<antcall target="build.jars"/>
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
 		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
-		<delete dir="${temp.folder}"/>
+		<delete dir="${temp.folder}"/> -->
 	</target>
 
 	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
@@ -222,8 +221,11 @@
 	</target>
 
 	<target name="build.cfiles" depends="build.jars">
+		<!-- compile the jar in org.eclipse.swt.tools -->
+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />		
+
 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
-		<!-- assumes the swt.jar has already been built  -->
+		<!-- assumes the swttools.jar has already been built  -->
 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
@@ -325,6 +327,8 @@
 		<delete file="${plugin.destination}/${full.name}.jar"/>
 		<delete file="${plugin.destination}/${full.name}.zip"/>
 		<delete dir="${temp.folder}"/>
+		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean" />
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running">

Lines 68-76 Link Here

(-)eclipse/files/post-patch-plugins-swt-gtk-build.sh (-3 / +3 lines)
68	- echo " *** Mozilla embedding support will not be compiled."	68	- echo " *** Mozilla embedding support will not be compiled."
69	+if [ ${MAKE_MOZILLA} != "" ]; then	69	+if [ ${MAKE_MOZILLA} != "" ]; then
70	+ if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then	70	+ if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
71	+ if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then	71	+ if [ x`pkg-config --exists %%GECKO%%-xpcom && echo YES` = "xYES" ]; then
72	+ GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`	72	+ GECKO_INCLUDES=`pkg-config --cflags %%GECKO%%-xpcom`
73	+ GECKO_LIBS=`pkg-config --libs mozilla-xpcom`	73	+ GECKO_LIBS=`pkg-config --libs %%GECKO%%-xpcom`
74	+ export GECKO_INCLUDES	74	+ export GECKO_INCLUDES
75	+ export GECKO_LIBS	75	+ export GECKO_LIBS
76	+ MAKE_MOZILLA=make_mozilla	76	+ MAKE_MOZILLA=make_mozilla




--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig	Thu Dec 14 18:01:12 2006
+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	Thu Dec 14 18:03:00 2006
@@ -48,7 +48,7 @@
 
 # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)

 	-I. \
 	-I$(JAVA_HOME)/include \
 	-I$(JAVA_HOME)/include/freebsd \
+	-I$(LOCALBASE)/include/%%GECKO%% \
+	-I$(LOCALBASE)/include/%%GECKO%%/profdirserviceprovider \
+	-I$(LOCALBASE)/include/%%GECKO%%/string \
+	-I$(LOCALBASE)/include/nspr \
 	${SWT_PTR_CFLAGS}
 MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic

 
 #
 # SWT libs
@@ -202,7 +207,7 @@
 #
 # Mozilla lib
 #
-make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB)
+make_mozilla:$(MOZILLA_LIB)
 
 $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS}
@@ -220,22 +225,22 @@
 	$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp	
 
 $(PROFILE14_OBJECTS): xpcom_profile.cpp
-	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
+	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
 
 $(PROFILE17_OBJECTS): xpcom_profile.cpp
-	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
+	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
 
 $(PROFILE18_OBJECTS): xpcom_profile.cpp
-	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
+	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
 
 $(PROFILE14_LIB): $(PROFILE14_OBJECTS)
-	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
+	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ${GECKO_LIBS}
 
 $(PROFILE17_LIB): $(PROFILE17_OBJECTS)
-	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
+	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ${GECKO_LIBS}
 
 $(PROFILE18_LIB): $(PROFILE18_OBJECTS)
-	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
+	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ${GECKO_LIBS}
 
 #
 # GLX lib




--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java.orig	Wed Nov 29 14:32:45 2006
+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java	Wed Nov 29 14:42:01 2006
@@ -10,15 +10,75 @@
  *******************************************************************************/
 package org.eclipse.swt.browser;
 
-import java.io.*;
-import java.util.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.gtk.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.layout.*;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.internal.Callback;
+import org.eclipse.swt.internal.Converter;
+import org.eclipse.swt.internal.Library;
+import org.eclipse.swt.internal.gtk.GdkEvent;
+import org.eclipse.swt.internal.gtk.LONG;
+import org.eclipse.swt.internal.gtk.OS;
+import org.eclipse.swt.internal.mozilla.XPCOM;
+import org.eclipse.swt.internal.mozilla.XPCOMObject;
+import org.eclipse.swt.internal.mozilla.nsEmbedString;
+import org.eclipse.swt.internal.mozilla.nsIAppShell;
+import org.eclipse.swt.internal.mozilla.nsIBaseWindow;
+import org.eclipse.swt.internal.mozilla.nsICategoryManager;
+import org.eclipse.swt.internal.mozilla.nsIComponentManager;
+import org.eclipse.swt.internal.mozilla.nsIComponentRegistrar;
+import org.eclipse.swt.internal.mozilla.nsIContextMenuListener;
+import org.eclipse.swt.internal.mozilla.nsICookie;
+import org.eclipse.swt.internal.mozilla.nsICookieManager;
+import org.eclipse.swt.internal.mozilla.nsID;
+import org.eclipse.swt.internal.mozilla.nsIDOMEvent;
+import org.eclipse.swt.internal.mozilla.nsIDOMMouseEvent;
+import org.eclipse.swt.internal.mozilla.nsIDOMWindow;
+import org.eclipse.swt.internal.mozilla.nsIDirectoryService;
+import org.eclipse.swt.internal.mozilla.nsIDocShell;
+import org.eclipse.swt.internal.mozilla.nsIEmbeddingSiteWindow;
+import org.eclipse.swt.internal.mozilla.nsIFile;
+import org.eclipse.swt.internal.mozilla.nsIIOService;
+import org.eclipse.swt.internal.mozilla.nsIInterfaceRequestor;
+import org.eclipse.swt.internal.mozilla.nsILocalFile;
+import org.eclipse.swt.internal.mozilla.nsIPrefBranch;
+import org.eclipse.swt.internal.mozilla.nsIPrefLocalizedString;
+import org.eclipse.swt.internal.mozilla.nsIPrefService;
+import org.eclipse.swt.internal.mozilla.nsIProperties;
+import org.eclipse.swt.internal.mozilla.nsIRequest;
+import org.eclipse.swt.internal.mozilla.nsIServiceManager;
+import org.eclipse.swt.internal.mozilla.nsISimpleEnumerator;
+import org.eclipse.swt.internal.mozilla.nsISupports;
+import org.eclipse.swt.internal.mozilla.nsISupportsWeakReference;
+import org.eclipse.swt.internal.mozilla.nsITooltipListener;
+import org.eclipse.swt.internal.mozilla.nsIURI;
+import org.eclipse.swt.internal.mozilla.nsIURIContentListener;
+import org.eclipse.swt.internal.mozilla.nsIWeakReference;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowser;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserChrome;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserChromeFocus;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserFocus;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserStream;
+import org.eclipse.swt.internal.mozilla.nsIWebNavigation;
+import org.eclipse.swt.internal.mozilla.nsIWebProgress;
+import org.eclipse.swt.internal.mozilla.nsIWebProgressListener;
+import org.eclipse.swt.internal.mozilla.nsIWindowWatcher;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
 
 /**
  * Instances of this class implement the browser user interface
@@ -175,40 +235,9 @@
 		 * - mozilla17profile/mozilla17profile-gcc should succeed for mozilla 1.7.x and firefox
 		 * - mozilla18profile/mozilla18profile-gcc should succeed for mozilla 1.8.x (seamonkey)
 		 */
-		try {
-			Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$
-			usingProfile = true;
-		} catch (UnsatisfiedLinkError e1) {
-			try {
-				Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$
-				usingProfile = true;
-			} catch (UnsatisfiedLinkError e2) {
-				try {
-					Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$
-					usingProfile = true;
-				} catch (UnsatisfiedLinkError e3) {
-					try {
-						Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$
-						usingProfile = true;
-					} catch (UnsatisfiedLinkError e4) {
-						try {
-							Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$
-							usingProfile = true;
-						} catch (UnsatisfiedLinkError e5) {
-							try {
-								Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$
-								usingProfile = true;
-							} catch (UnsatisfiedLinkError e6) {
-								/* 
-								* fail silently, the Browser will still work without profile support
-								* but will abort any attempts to navigate to HTTPS pages
-								*/
-							}
-						}
-					}
-				}
-			}
-		}
+		//Library.loadLibrary("swt-mozilla17-profile");
+		// We build the profile stuff without the need for a separate DSO
+		usingProfile = true;
 
 		int /*long*/[] retVal = new int /*long*/[1];
 		nsEmbedString pathString = new nsEmbedString(mozillaPath);
@@ -218,11 +247,11 @@
 		if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER);
 		
 		nsILocalFile localFile = new nsILocalFile(retVal[0]);
-		rc = XPCOM.NS_InitEmbedding(localFile.getAddress(), 0);
+		rc = XPCOM.NS_InitXPCOM3(0, localFile.getAddress(), 0, 0, 0);
 		localFile.Release();
 		if (rc != XPCOM.NS_OK) {
 			dispose();
-			SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitEmbedding "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitXPCOM3 "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 
 		rc = XPCOM.NS_GetComponentManager(result);
@@ -283,7 +312,7 @@
 			rc = properties.Get(buffer, nsIFile.NS_IFILE_IID, result);
 			if (rc != XPCOM.NS_OK) error(rc);
 			if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
-			properties.Release();
+			// properties.Release() is now after the Set below
 
 			nsIFile profileDir = new nsIFile(result[0]);
 			result[0] = 0;
@@ -305,24 +334,15 @@
 			pathString.dispose(); //
 
 			profileDir = new nsIFile(result[0]);
-			result[0] = 0;
-
-			rc = XPCOM_PROFILE.NS_NewProfileDirServiceProvider(true, result);
+			
+			// Set the profile dir property so that it's initialized for
+			// things like password manager and https
+			buffer = Converter.wcsToMbcs(null, XPCOM.NS_APP_USER_PROFILE_50_DIR, true);
+			rc = properties.Set(buffer, profileDir.getAddress());
 			if (rc != XPCOM.NS_OK) error(rc);
-			if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
-
-			final int /*long*/ dirServiceProvider = result[0];
+			properties.Release();
+						
 			result[0] = 0;
-			rc = XPCOM_PROFILE.ProfileDirServiceProvider_Register(dirServiceProvider);
-			if (rc != XPCOM.NS_OK) error(rc);
-			rc = XPCOM_PROFILE.ProfileDirServiceProvider_SetProfileDir(dirServiceProvider, profileDir.getAddress());
-			if (rc != XPCOM.NS_OK) error(rc);
-
-			getDisplay().addListener(SWT.Dispose, new Listener() {
-				public void handleEvent(Event e) {
-					XPCOM_PROFILE.ProfileDirServiceProvider_Shutdown(dirServiceProvider);
-				}
-			});
 		}
 
 		/*




--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java.orig	Wed Nov 29 14:11:42 2006
+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java	Wed Nov 29 14:14:30 2006
@@ -89,6 +89,7 @@
 	public static final int NS_ERROR_HTMLPARSER_UNRESOLVEDDTD = 0x804e03f3;
 	public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012;
 	public static final String NS_APP_APPLICATION_REGISTRY_DIR = "AppRegD"; //$NON-NLS-1$
+	public static final String NS_APP_USER_PROFILE_50_DIR = "ProfD"; //$NON-NLS-1$
 
 public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);
 public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);
@@ -103,9 +104,8 @@
 public static final native void memmove(byte[] dest, char[] src, int nbytes);
 public static final native int NS_GetComponentManager(int /*long*/[] result);
 public static final native int NS_GetServiceManager(int /*long*/[] result);
-public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider);
+public static final native int NS_InitXPCOM3(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider, int /*long*/ staticComponents, int componentCount);
 public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result);
-public static final native int NS_TermEmbedding();
 public static final native int strlen_PRUnichar(int /*long*/ s);
 public static final native int /*long*/ nsEmbedCString_new();
 public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length);




--- plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties.orig	Wed Nov 29 14:17:21 2006
+++ plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties	Wed Nov 29 14:18:14 2006
@@ -24,16 +24,17 @@
 XPCOM_NS_GetServiceManager=
 XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)
 
-XPCOM_NS_InitEmbedding=
-XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
-XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3=
+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
 
 XPCOM_NS_NewLocalFile=
 XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
 XPCOM_NS_NewLocalFile_1=
 XPCOM_NS_NewLocalFile_2=cast=(nsILocalFile**)
-
-XPCOM_NS_TermEmbedding=
 
 XPCOM_PR_Free=
 XPCOM_PR_Free_0=cast=(void *)




--- plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM_PROFILE.properties.orig	Mon Dec 11 02:02:04 2006
+++ plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM_PROFILE.properties	Mon Dec 11 02:03:34 2006
@@ -24,16 +24,17 @@
 XPCOM_NS_GetServiceManager=
 XPCOM_NS_GetServiceManager_0=
 
-XPCOM_NS_InitEmbedding=
-XPCOM_NS_InitEmbedding_0=
-XPCOM_NS_InitEmbedding_1=
+XPCOM_NS_InitXPCOM3=
+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
 
 XPCOM_NS_NewLocalFile=
 XPCOM_NS_NewLocalFile_0=
 XPCOM_NS_NewLocalFile_1=
 XPCOM_NS_NewLocalFile_2=
-
-XPCOM_NS_TermEmbedding=
 
 XPCOM_PR_Free=
 XPCOM_PR_Free_0=




--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp.orig	Thu Sep 21 10:57:23 2006
+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp	Wed Nov 29 19:46:27 2006
@@ -85,14 +85,16 @@
 }
 #endif
 
-#ifndef NO_NS_1InitEmbedding
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#ifndef NO_NS_1InitXPCOM3
+JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC);
-	rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1);
-	XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentRegistrar_FUNC);
+	rc = (jint)NS_InitXPCOM3((nsIServiceManager **)arg0, (nsIFile *)arg1,
+		(nsIDirectoryServiceProvider *)arg2, (nsStaticModuleInfo *)arg3,
+		(PRUint32) arg4);
+	XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentRegistrar_FUNC);
 	return rc;
 }
 #endif
@@ -113,18 +115,6 @@
 }
 #endif
 
-#ifndef NO_NS_1TermEmbedding
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1TermEmbedding)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, NS_1TermEmbedding_FUNC);
-	rc = (jint)NS_TermEmbedding();
-	XPCOM_NATIVE_EXIT(env, that, NS_1TermEmbedding_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_PR_1Free
 JNIEXPORT void JNICALL XPCOM_NATIVE(PR_1Free)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -141,7 +131,7 @@
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, PR_1Malloc_FUNC);
-	rc = (jint)PR_Malloc(arg0);
+	rc = (long)PR_Malloc(arg0);
 	XPCOM_NATIVE_EXIT(env, that, PR_1Malloc_FUNC);
 	return rc;
 }
@@ -2091,7 +2081,7 @@
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
-	rc = (jint)((nsEmbedCString *)arg0)->get();
+	rc = (long)((nsEmbedCString *)arg0)->get();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
 	return rc;
 }
@@ -2103,7 +2093,7 @@
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
-	rc = (jint)new nsEmbedCString();
+	rc = (long)new nsEmbedCString();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
 	return rc;
 }
@@ -2117,7 +2107,7 @@
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
 	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
+	rc = (long)new nsEmbedCString((const char *)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
@@ -2131,7 +2121,7 @@
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
-	rc = (jint)((nsEmbedString *)arg0)->Length();
+	rc = (long)((nsEmbedString *)arg0)->Length();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1Length_FUNC);
 	return rc;
 }
@@ -2153,7 +2143,7 @@
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
-	rc = (jint)((nsEmbedString *)arg0)->get();
+	rc = (long)((nsEmbedString *)arg0)->get();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
 	return rc;
 }
@@ -2165,7 +2155,7 @@
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
-	rc = (jint)new nsEmbedString();
+	rc = (long)new nsEmbedString();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
 	return rc;
 }
@@ -2179,7 +2169,7 @@
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new nsEmbedString(lparg0);
+	rc = (long)new nsEmbedString(lparg0);
 fail:
 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
@@ -2193,7 +2183,7 @@
 {
 	jboolean rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
-	rc = (jboolean)((nsID *)arg0)->Equals(*(nsID *)arg1);
+	rc = (long)((nsID *)arg0)->Equals(*(nsID *)arg1);
 	XPCOM_NATIVE_EXIT(env, that, nsID_1Equals_FUNC);
 	return rc;
 }
@@ -2207,7 +2197,7 @@
 	jboolean rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsID_1Parse_FUNC);
 	if (arg1) if ((lparg1 = env->GetStringUTFChars(arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)((nsID *)arg0)->Parse((const char *)lparg1);
+	rc = (long)((nsID *)arg0)->Parse((const char *)lparg1);
 fail:
 	if (arg1 && lparg1) env->ReleaseStringUTFChars(arg1, lparg1);
 	XPCOM_NATIVE_EXIT(env, that, nsID_1Parse_FUNC);
@@ -2231,7 +2221,7 @@
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
-	rc = (jint)new nsID();
+	rc = (long)new nsID();
 	XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
 	return rc;
 }




--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h.orig	Wed Nov 29 12:11:18 2006
+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h	Wed Nov 29 12:12:03 2006
@@ -31,8 +31,7 @@
 
 #define NDEBUG
 
-#include "nsXPCOM.h"
-#include "nsEmbedAPI.h"	
+#include "nsXPCOM.h"	
 #include "nsEmbedString.h"
 #include "nsIInputStream.h"
 #include "nsISupportsUtils.h"

Line 0 Link Here

(-)eclipse/files/post-patch-plugins-swt-mozilla-xpcom_profile.h (+11 lines)
	1	--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h.orig Wed Nov 29 12:08:43 2006
	2	+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h Wed Nov 29 12:09:33 2006
	3	@@ -32,7 +32,7 @@
	4	#define NDEBUG
	5
	6	#include "nsCOMPtr.h"
	7	-#include "nsProfileDirServiceProvider.h"
	8	+#include "profdirserviceprovider/nsProfileDirServiceProvider.h"
	9	#include "xpcom_stats.h"
	10
	11	#endif /* INC_xpcom_profile_H */




--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp.orig	Wed Nov 29 12:03:05 2006
+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp	Wed Nov 29 12:05:26 2006
@@ -31,15 +31,14 @@
 
 #ifdef NATIVE_STATS
 
-int XPCOM_nativeFunctionCount = 132;
-int XPCOM_nativeFunctionCallCount[132];
+int XPCOM_nativeFunctionCount = 131;
+int XPCOM_nativeFunctionCallCount[131];
 char * XPCOM_nativeFunctionNames[] = {
 	"Call",
 	"NS_1GetComponentManager",
 	"NS_1GetServiceManager",
-	"NS_1InitEmbedding",
+	"NS_1InitXPCOM3_FUNC",
 	"NS_1NewLocalFile",
-	"NS_1TermEmbedding",
 	"PR_1Free",
 	"PR_1Malloc",
 	"VtblCall__II",




--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h.orig	Wed Nov 29 13:51:40 2006
+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h	Wed Nov 29 13:52:23 2006
@@ -41,9 +41,8 @@
 	Call_FUNC,
 	NS_1GetComponentManager_FUNC,
 	NS_1GetServiceManager_FUNC,
-	NS_1InitEmbedding_FUNC,
+	NS_1InitXPCOM3_FUNC,
 	NS_1NewLocalFile_FUNC,
-	NS_1TermEmbedding_FUNC,
 	PR_1Free_FUNC,
 	PR_1Malloc_FUNC,
 	VtblCall__II_FUNC,

Lines 1-5 Link Here

(-)eclipse/scripts/pre-patch (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	# $FreeBSD: ports/java/eclipse/scripts/pre-patch,v 1.3 2006/11/04 02:06:50 kan Exp $	2	# $FreeBSD$
3		3
4	copy_file()	4	copy_file()
5	{	5	{

Return to bug 105581

Lines 4-17 Link Here

(-)eclipse/files/eclipse.in (-3 / +4 lines)
4	#	4	#
5	# See: http://www.eclipse.org	5	# See: http://www.eclipse.org
6	#	6	#
7	# $FreeBSD: ports/java/eclipse/files/eclipse.in,v 1.8 2006/11/04 02:06:49 kan Exp $	7	# $FreeBSD$
8	#	8	#
9		9
10	DEFAULT_JAVA_HOME=%%PREFIX%%	10	DEFAULT_JAVA_HOME=%%PREFIX%%
11	ECLIPSE_HOME=%%ECLIPSE_HOME%%	11	ECLIPSE_HOME=%%ECLIPSE_HOME%%
12	DEFAULT_JAVA_CMD=java	12	DEFAULT_JAVA_CMD=java
13	MOZILLA_FIVE_HOME=%%LOCALBASE%%/include/%%BROWSER%%	13	MOZILLA_FIVE_HOME=%%LOCALBASE%%/lib/%%BROWSER%%
14	export MOZILLA_FIVE_HOME	14	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
		15	export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
15		16
16	#-----------------------------------------------------------------------------	17	#-----------------------------------------------------------------------------
17	# Determine configuration settings	18	# Determine configuration settings

Line 0 Link Here

(-)eclipse/files/patch-plugins-swt-amd64-build.xml (+45 lines)
	1	--- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig Mon Dec 11 01:10:05 2006
	2	+++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml Mon Dec 11 01:20:33 2006
	3	@@ -39,18 +39,17 @@
	4
	5	<target name="properties" if="eclipse.running">
	6	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
	7	- <!--compile the jar in org.eclipse.swt.tools-->
	8	</target>
	9
	10	<target name="build.update.jar" depends="init">
	11	- <delete dir="${temp.folder}"/>
	12	+ <!-- <delete dir="${temp.folder}"/>
	13	<mkdir dir="${temp.folder}"/>
	14	<antcall target="build.jars"/>
	15	<antcall target="gather.bin.parts">
	16	<param name="destination.temp.folder" value="${temp.folder}/"/>
	17	</antcall>
	18	<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
	19	- <delete dir="${temp.folder}"/>
	20	+ <delete dir="${temp.folder}"/> -->
	21	</target>
	22
	23	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
	24	@@ -222,8 +221,11 @@
	25	</target>
	26
	27	<target name="build.cfiles" depends="build.jars">
	28	+ <!-- compile the jar in org.eclipse.swt.tools -->
	29	+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
	30	+
	31	<!-- generate the C code from the (64 bit) SWT PI java classes -->
	32	- <!-- assumes the swt.jar has already been built -->
	33	+ <!-- assumes the swttools.jar has already been built -->
	34	<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
	35	<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
	36	<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
	37	@@ -325,6 +327,8 @@
	38	<delete file="${plugin.destination}/${full.name}.jar"/>
	39	<delete file="${plugin.destination}/${full.name}.zip"/>
	40	<delete dir="${temp.folder}"/>
	41	+ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
	42	+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean" />
	43	</target>
	44
	45	<target name="refresh" depends="init" if="eclipse.running">

Line 0 Link Here

(-)eclipse/files/post-patch-plugins-swt-mozilla-XPCOM.properties (+25 lines)
	1	--- plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties.orig Wed Nov 29 14:17:21 2006
	2	+++ plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties Wed Nov 29 14:18:14 2006
	3	@@ -24,16 +24,17 @@
	4	XPCOM_NS_GetServiceManager=
	5	XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)
	6
	7	-XPCOM_NS_InitEmbedding=
	8	-XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
	9	-XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
	10	+XPCOM_NS_InitXPCOM3=
	11	+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
	12	+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
	13	+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
	14	+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
	15	+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
	16
	17	XPCOM_NS_NewLocalFile=
	18	XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
	19	XPCOM_NS_NewLocalFile_1=
	20	XPCOM_NS_NewLocalFile_2=cast=(nsILocalFile**)
	21	-
	22	-XPCOM_NS_TermEmbedding=
	23
	24	XPCOM_PR_Free=
	25	XPCOM_PR_Free_0=cast=(void *)