rpms/eclipse/devel eclipse-swt-firefox.patch, 1.6, 1.7 eclipse.spec, 1.335, 1.336
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 29 13:24:01 UTC 2006
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20458
Modified Files:
eclipse-swt-firefox.patch eclipse.spec
Log Message:
* Fri Sep 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
- Fix swt-firefox patch to not create DSOs with undefined symbols.
eclipse-swt-firefox.patch:
Eclipse_SWT_Mozilla/common/library/xpcom.cpp | 26 -
Eclipse_SWT_Mozilla/common/library/xpcom.h | 1
Eclipse_SWT_Mozilla/common/library/xpcom_profile.h | 2
Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp | 7
Eclipse_SWT_Mozilla/common/library/xpcom_stats.h | 3
Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java | 3
Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java | 199 +++++-----
Eclipse_SWT_PI/gtk/library/build.sh | 6
Eclipse_SWT_PI/gtk/library/make_linux.mak | 16
9 files changed, 142 insertions(+), 121 deletions(-)
Index: eclipse-swt-firefox.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-swt-firefox.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-swt-firefox.patch 29 Sep 2006 05:22:52 -0000 1.6
+++ eclipse-swt-firefox.patch 29 Sep 2006 13:23:59 -0000 1.7
@@ -1,10 +1,141 @@
+### 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 29 Sep 2006 13:21:51 -0000
+@@ -202,7 +202,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 +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 29 Sep 2006 13:21:51 -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 29 Sep 2006 13:21:49 -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_FUNC",
+ "NS_1NewLocalFile",
+- "NS_1TermEmbedding",
+ "PR_1Free",
+ "PR_1Malloc",
+ "VtblCall__II",
+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 13:21:48 -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 29 Sep 2006 13:21:48 -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 29 Sep 2006 05:02:24 -0000
++++ Eclipse_SWT_Mozilla/common/library/xpcom.cpp 29 Sep 2006 13:21:48 -0000
@@ -85,14 +85,16 @@
}
#endif
@@ -47,70 +178,13 @@
#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 29 Sep 2006 05:02:25 -0000
++++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 29 Sep 2006 13:21:49 -0000
@@ -41,9 +41,8 @@
Call_FUNC,
NS_1GetComponentManager_FUNC,
@@ -122,39 +196,13 @@
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 29 Sep 2006 05:02:33 -0000
++++ Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 29 Sep 2006 13:21:51 -0000
@@ -10,15 +10,75 @@
*******************************************************************************/
package org.eclipse.swt.browser;
@@ -240,7 +288,85 @@
/**
* Instances of this class implement the browser user interface
-@@ -218,11 +278,11 @@
+@@ -175,40 +235,43 @@
+ * - 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;
++// 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
++// */
++// }
++// }
++// }
++// }
++// }
++// }
+
+ int /*long*/[] retVal = new int /*long*/[1];
+ nsEmbedString pathString = new nsEmbedString(mozillaPath);
+@@ -218,11 +281,11 @@
if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER);
nsILocalFile localFile = new nsILocalFile(retVal[0]);
@@ -254,7 +380,7 @@
}
rc = XPCOM.NS_GetComponentManager(result);
-@@ -283,7 +343,7 @@
+@@ -283,7 +346,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);
@@ -263,7 +389,7 @@
nsIFile profileDir = new nsIFile(result[0]);
result[0] = 0;
-@@ -305,24 +365,15 @@
+@@ -305,24 +368,15 @@
pathString.dispose(); //
profileDir = new nsIFile(result[0]);
@@ -295,7 +421,7 @@
}
/*
-@@ -1354,27 +1405,6 @@
+@@ -1354,27 +1408,6 @@
tip = null;
BrowserCount--;
@@ -323,75 +449,27 @@
}
void Activate() {
-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 29 Sep 2006 05:02:35 -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_PI/gtk/library/make_linux.mak
+Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
===================================================================
-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}
+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 13:21:49 -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$
- #
- # GLX lib
-@@ -264,4 +264,4 @@
- # Clean
- #
- clean:
-- rm -f *.o *.so
-+ rm -f *.o *.so
-\ No newline at end of file
+ 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);
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- eclipse.spec 29 Sep 2006 05:22:52 -0000 1.335
+++ eclipse.spec 29 Sep 2006 13:23:59 -0000 1.336
@@ -32,7 +32,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -115,7 +115,7 @@
Patch57: %{name}-ecj-gcj.patch
# Build against firefox:
# - fix swt profile include path
-# - only compile the mozilla 1.7 / firefox profile library
+# - don't compile the mozilla 1.7 / firefox profile library -- build it inline
# - don't use symbols not in our firefox builds
# FIXME: add reference(s) to discussion(s) and bug(s)
# Note: I made this patch from within Eclipse and then did the following to
@@ -1596,6 +1596,9 @@
%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
+* Fri Sep 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
+- Fix swt-firefox patch to not create DSOs with undefined symbols.
+
* Thu Sep 28 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-1
- 3.2.1 final.
More information about the fedora-cvs-commits
mailing list