From e29267e3cbf93f20bcbc8c6026006d18542e9237 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Sep 29 2006 05:22:52 +0000 Subject: a few fixes for swt firefox patch --- diff --git a/eclipse-swt-firefox.2.patch b/eclipse-swt-firefox.2.patch new file mode 100644 index 0000000..e3d31ad --- /dev/null +++ b/eclipse-swt-firefox.2.patch @@ -0,0 +1,33 @@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.swt.tools +Index: JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties,v +retrieving revision 1.11.2.1 +diff -u -r1.11.2.1 org.eclipse.swt.internal.mozilla.XPCOM.properties +--- JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 26 Jul 2006 16:33:11 -0000 1.11.2.1 ++++ JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 29 Sep 2006 04:51:03 -0000 +@@ -24,17 +24,18 @@ + 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 *) + diff --git a/eclipse-swt-firefox.patch b/eclipse-swt-firefox.patch index 1c1393e..0652284 100644 --- a/eclipse-swt-firefox.patch +++ b/eclipse-swt-firefox.patch @@ -1,131 +1,10 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.swt -Index: Eclipse_SWT_PI/gtk/library/make_linux.mak -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/make_linux.mak,v -retrieving revision 1.33.2.1 -diff -u -r1.33.2.1 make_linux.mak ---- Eclipse_SWT_PI/gtk/library/make_linux.mak 26 Jul 2006 16:33:23 -0000 1.33.2.1 -+++ Eclipse_SWT_PI/gtk/library/make_linux.mak 28 Sep 2006 20:15:54 -0000 -@@ -202,7 +202,7 @@ - # - # Mozilla lib - # --make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB) -+make_mozilla:$(MOZILLA_LIB) $(PROFILE17_LIB) - - $(MOZILLA_LIB): $(MOZILLA_OBJECTS) - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} -@@ -220,22 +220,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 -@@ -264,4 +264,4 @@ - # Clean - # - clean: -- rm -f *.o *.so -+ rm -f *.o *.so -\ No newline at end of file -Index: Eclipse_SWT_PI/gtk/library/build.sh -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/build.sh,v -retrieving revision 1.40 -diff -u -r1.40 build.sh ---- Eclipse_SWT_PI/gtk/library/build.sh 22 Nov 2005 04:48:15 -0000 1.40 -+++ Eclipse_SWT_PI/gtk/library/build.sh 28 Sep 2006 20:15:54 -0000 -@@ -87,9 +87,9 @@ - fi - - if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then -- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then -- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom` -- GECKO_LIBS=`pkg-config --libs mozilla-xpcom` -+ if [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then -+ GECKO_INCLUDES=`pkg-config --cflags firefox-xpcom` -+ GECKO_LIBS=`pkg-config --libs firefox-xpcom` - export GECKO_INCLUDES - export GECKO_LIBS - MAKE_MOZILLA=make_mozilla -Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp,v -retrieving revision 1.15.2.1 -diff -u -r1.15.2.1 xpcom_stats.cpp ---- Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 26 Jul 2006 16:33:23 -0000 1.15.2.1 -+++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 28 Sep 2006 20:15:53 -0000 -@@ -37,7 +37,7 @@ - "Call", - "NS_1GetComponentManager", - "NS_1GetServiceManager", -- "NS_1InitEmbedding", -+ "NS_1InitXPCOM3_FUNC", - "NS_1NewLocalFile", - "NS_1TermEmbedding", - "PR_1Free", -Index: Eclipse_SWT_Mozilla/common/library/xpcom_profile.h -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_profile.h,v -retrieving revision 1.1.2.1 -diff -u -r1.1.2.1 xpcom_profile.h ---- Eclipse_SWT_Mozilla/common/library/xpcom_profile.h 26 Jul 2006 16:33:23 -0000 1.1.2.1 -+++ Eclipse_SWT_Mozilla/common/library/xpcom_profile.h 28 Sep 2006 20:15:53 -0000 -@@ -32,7 +32,7 @@ - #define NDEBUG - - #include "nsCOMPtr.h" --#include "nsProfileDirServiceProvider.h" -+#include "profdirserviceprovider/nsProfileDirServiceProvider.h" - #include "xpcom_stats.h" - - #endif /* INC_xpcom_profile_H */ -Index: Eclipse_SWT_Mozilla/common/library/xpcom.h -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h,v -retrieving revision 1.6.2.1 -diff -u -r1.6.2.1 xpcom.h ---- Eclipse_SWT_Mozilla/common/library/xpcom.h 26 Jul 2006 16:33:23 -0000 1.6.2.1 -+++ Eclipse_SWT_Mozilla/common/library/xpcom.h 28 Sep 2006 20:15:53 -0000 -@@ -32,7 +32,6 @@ - #define NDEBUG - - #include "nsXPCOM.h" --#include "nsEmbedAPI.h" - #include "nsEmbedString.h" - #include "nsIInputStream.h" - #include "nsISupportsUtils.h" Index: Eclipse_SWT_Mozilla/common/library/xpcom.cpp =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp,v retrieving revision 1.29.2.1 diff -u -r1.29.2.1 xpcom.cpp --- Eclipse_SWT_Mozilla/common/library/xpcom.cpp 26 Jul 2006 16:33:23 -0000 1.29.2.1 -+++ Eclipse_SWT_Mozilla/common/library/xpcom.cpp 28 Sep 2006 20:15:53 -0000 ++++ Eclipse_SWT_Mozilla/common/library/xpcom.cpp 29 Sep 2006 05:02:24 -0000 @@ -85,14 +85,16 @@ } #endif @@ -149,29 +28,133 @@ diff -u -r1.29.2.1 xpcom.cpp 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) +Index: Eclipse_SWT_Mozilla/common/library/xpcom.h +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h,v +retrieving revision 1.6.2.1 +diff -u -r1.6.2.1 xpcom.h +--- Eclipse_SWT_Mozilla/common/library/xpcom.h 26 Jul 2006 16:33:23 -0000 1.6.2.1 ++++ Eclipse_SWT_Mozilla/common/library/xpcom.h 29 Sep 2006 05:02:25 -0000 +@@ -32,7 +32,6 @@ + #define NDEBUG + + #include "nsXPCOM.h" +-#include "nsEmbedAPI.h" + #include "nsEmbedString.h" + #include "nsIInputStream.h" + #include "nsISupportsUtils.h" +Index: Eclipse_SWT_Mozilla/common/library/xpcom_profile.h +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_profile.h,v +retrieving revision 1.1.2.1 +diff -u -r1.1.2.1 xpcom_profile.h +--- Eclipse_SWT_Mozilla/common/library/xpcom_profile.h 26 Jul 2006 16:33:23 -0000 1.1.2.1 ++++ Eclipse_SWT_Mozilla/common/library/xpcom_profile.h 29 Sep 2006 05:02:25 -0000 +@@ -32,7 +32,7 @@ + #define NDEBUG + + #include "nsCOMPtr.h" +-#include "nsProfileDirServiceProvider.h" ++#include "profdirserviceprovider/nsProfileDirServiceProvider.h" + #include "xpcom_stats.h" + + #endif /* INC_xpcom_profile_H */ +Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp,v +retrieving revision 1.15.2.1 +diff -u -r1.15.2.1 xpcom_stats.cpp +--- Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 26 Jul 2006 16:33:23 -0000 1.15.2.1 ++++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 29 Sep 2006 05:02:25 -0000 +@@ -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", + "NS_1NewLocalFile", +- "NS_1TermEmbedding", + "PR_1Free", + "PR_1Malloc", + "VtblCall__II", Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.h =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h,v retrieving revision 1.14.2.1 diff -u -r1.14.2.1 xpcom_stats.h --- Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 26 Jul 2006 16:33:23 -0000 1.14.2.1 -+++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 28 Sep 2006 20:15:53 -0000 -@@ -41,7 +41,7 @@ ++++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 29 Sep 2006 05:02:25 -0000 +@@ -41,9 +41,8 @@ Call_FUNC, NS_1GetComponentManager_FUNC, NS_1GetServiceManager_FUNC, - NS_1InitEmbedding_FUNC, + NS_1InitXPCOM3_FUNC, NS_1NewLocalFile_FUNC, - NS_1TermEmbedding_FUNC, +- NS_1TermEmbedding_FUNC, PR_1Free_FUNC, + PR_1Malloc_FUNC, + VtblCall__II_FUNC, +Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java,v +retrieving revision 1.48.2.1 +diff -u -r1.48.2.1 XPCOM.java +--- Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 26 Jul 2006 16:33:23 -0000 1.48.2.1 ++++ Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 29 Sep 2006 05:02:27 -0000 +@@ -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); Index: Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java,v retrieving revision 1.61.2.2 diff -u -r1.61.2.2 Browser.java --- Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 24 Aug 2006 20:19:25 -0000 1.61.2.2 -+++ Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 28 Sep 2006 20:15:54 -0000 ++++ Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 29 Sep 2006 05:02:33 -0000 @@ -10,15 +10,75 @@ *******************************************************************************/ package org.eclipse.swt.browser; @@ -312,27 +295,103 @@ diff -u -r1.61.2.2 Browser.java } /* -Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java +@@ -1354,27 +1405,6 @@ + tip = null; + + BrowserCount--; +- /* +- * This code is intentionally commented. It is not possible to reinitialize +- * Mozilla once it has been terminated. NS_InitEmbedding always fails after +- * NS_TermEmbedding has been called. The workaround is to call NS_InitEmbedding +- * once and never call NS_TermEmbedding. +- */ +-// if (BrowserCount == 0) { +-// if (AppShell != null) { +-// // Shutdown the appshell service. +-// rc = AppShell.Spindown(); +-// if (rc != XPCOM.NS_OK) error(rc); +-// AppShell.Release(); +-// AppShell = null; +-// } +-// WindowCreator.Release(); +-// WindowCreator = null; +-// PromptService.Release(); +-// PromptService = null; +-// XPCOM.NS_TermEmbedding(); +-// mozilla = false; +-// } + } + + void Activate() { +Index: Eclipse_SWT_PI/gtk/library/build.sh =================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java,v -retrieving revision 1.48.2.1 -diff -u -r1.48.2.1 XPCOM.java ---- Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 26 Jul 2006 16:33:23 -0000 1.48.2.1 -+++ Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 28 Sep 2006 20:15:53 -0000 -@@ -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$ +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/build.sh,v +retrieving revision 1.40 +diff -u -r1.40 build.sh +--- Eclipse_SWT_PI/gtk/library/build.sh 22 Nov 2005 04:48:15 -0000 1.40 ++++ Eclipse_SWT_PI/gtk/library/build.sh 29 Sep 2006 05:02:35 -0000 +@@ -87,9 +87,9 @@ + fi - 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,7 +104,7 @@ - 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); + if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then +- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then +- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom` +- GECKO_LIBS=`pkg-config --libs mozilla-xpcom` ++ if [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then ++ GECKO_INCLUDES=`pkg-config --cflags firefox-xpcom` ++ GECKO_LIBS=`pkg-config --libs firefox-xpcom` + export GECKO_INCLUDES + export GECKO_LIBS + MAKE_MOZILLA=make_mozilla +Index: Eclipse_SWT_PI/gtk/library/make_linux.mak +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/make_linux.mak,v +retrieving revision 1.33.2.1 +diff -u -r1.33.2.1 make_linux.mak +--- Eclipse_SWT_PI/gtk/library/make_linux.mak 26 Jul 2006 16:33:23 -0000 1.33.2.1 ++++ Eclipse_SWT_PI/gtk/library/make_linux.mak 29 Sep 2006 05:02:36 -0000 +@@ -202,7 +202,7 @@ + # + # Mozilla lib + # +-make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB) ++make_mozilla:$(MOZILLA_LIB) $(PROFILE17_LIB) + + $(MOZILLA_LIB): $(MOZILLA_OBJECTS) + $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} +@@ -220,22 +220,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 +@@ -264,4 +264,4 @@ + # Clean + # + clean: +- rm -f *.o *.so ++ rm -f *.o *.so +\ No newline at end of file diff --git a/eclipse.spec b/eclipse.spec index 4966d75..edab893 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -123,6 +123,7 @@ Patch57: %{name}-ecj-gcj.patch # sed --in-place "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g" eclipse-swt-firefox.patch # sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch Patch59: %{name}-swt-firefox.patch +Patch60: %{name}-swt-firefox.2.patch Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch %if %{gcj_support} @@ -453,14 +454,19 @@ popd rm plugins/org.junit4/junit-4.1.jar # I love directories with spaces in their names -mv "plugins/org.eclipse.swt/Eclipse SWT Mozilla" plugins/org.eclipse.swt/Eclipse_SWT_Mozilla -mv "plugins/org.eclipse.swt/Eclipse SWT PI" plugins/org.eclipse.swt/Eclipse_SWT_PI pushd plugins/org.eclipse.swt +mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla +mv "Eclipse SWT PI" Eclipse_SWT_PI %patch59 +mv Eclipse_SWT_Mozilla "Eclipse SWT Mozilla" +mv Eclipse_SWT_PI "Eclipse SWT PI" popd -mv plugins/org.eclipse.swt/Eclipse_SWT_Mozilla "plugins/org.eclipse.swt/Eclipse SWT Mozilla" -mv plugins/org.eclipse.swt/Eclipse_SWT_PI "plugins/org.eclipse.swt/Eclipse SWT PI" - +pushd plugins/org.eclipse.swt.tools +mv "JNI Generation" JNI_Generation +%patch60 +mv JNI_Generation "JNI Generation" +popd + # FIXME check if this has been applied upstream pushd plugins/org.eclipse.platform.doc.isv %patch100 -p0