From fa12a03fd9d69e60bb68210225bfaf6a75ce41b0 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Sep 09 2006 20:21:55 +0000 Subject: - Add sparc support (Dennis Gilmore ) - fix eclipse-swt-firefox.patch to work on 64 bit systems. --- diff --git a/eclipse-swt-firefox.patch b/eclipse-swt-firefox.patch index b5ab917..c3c338d 100644 --- a/eclipse-swt-firefox.patch +++ b/eclipse-swt-firefox.patch @@ -1,10 +1,26 @@ -Index: Eclipse SWT Mozilla/common/library/xpcom.cpp +Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.h =================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp,v +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h,v +retrieving revision 1.14 +diff -u -r1.14 xpcom_stats.h +--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 9 May 2006 21:52:54 -0000 1.14 ++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 9 Sep 2006 14:39:35 -0000 +@@ -41,7 +41,7 @@ + Call_FUNC, + NS_1GetComponentManager_FUNC, + NS_1GetServiceManager_FUNC, +- NS_1InitEmbedding_FUNC, ++ NS_1InitXPCOM3_FUNC, + NS_1NewLocalFile_FUNC, + NS_1TermEmbedding_FUNC, + PR_1Free_FUNC, +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 diff -u -r1.29 xpcom.cpp ---- Eclipse_SWT_Mozilla/common/library/xpcom.cpp 9 May 2006 21:52:54 -0000 1.29 -+++ Eclipse_SWT_Mozilla/common/library/xpcom.cpp 7 Sep 2006 22:41:43 -0000 +--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp 9 May 2006 21:52:54 -0000 1.29 ++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp 9 Sep 2006 14:39:35 -0000 @@ -85,14 +85,16 @@ } #endif @@ -28,29 +44,29 @@ diff -u -r1.29 xpcom.cpp return rc; } #endif -Index: Eclipse SWT Mozilla/common/library/xpcom_stats.h +Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java =================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h,v -retrieving revision 1.14 -diff -u -r1.14 xpcom_stats.h ---- Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 9 May 2006 21:52:54 -0000 1.14 -+++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 7 Sep 2006 22:41:43 -0000 -@@ -41,7 +41,7 @@ - Call_FUNC, - NS_1GetComponentManager_FUNC, - NS_1GetServiceManager_FUNC, -- NS_1InitEmbedding_FUNC, -+ NS_1InitXPCOM3_FUNC, - NS_1NewLocalFile_FUNC, - NS_1TermEmbedding_FUNC, - PR_1Free_FUNC, -Index: Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java,v +retrieving revision 1.48 +diff -u -r1.48 XPCOM.java +--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 9 May 2006 18:54:24 -0000 1.48 ++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 9 Sep 2006 14:39:36 -0000 +@@ -102,7 +102,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_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 +RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java,v retrieving revision 1.61 diff -u -r1.61 Browser.java ---- Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 9 May 2006 19:47:09 -0000 1.61 -+++ Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 7 Sep 2006 22:41:44 -0000 +--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 9 May 2006 19:47:09 -0000 1.61 ++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 9 Sep 2006 14:39:37 -0000 @@ -175,11 +175,11 @@ if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER); @@ -65,19 +81,24 @@ diff -u -r1.61 Browser.java } rc = XPCOM.NS_GetComponentManager(result); -Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java +Index: JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties =================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java,v -retrieving revision 1.48 -diff -u -r1.48 XPCOM.java ---- Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 9 May 2006 18:54:24 -0000 1.48 -+++ Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 7 Sep 2006 22:41:43 -0000 -@@ -102,7 +102,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); +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 +diff -u -r1.11 org.eclipse.swt.internal.mozilla.XPCOM.properties +--- plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 9 May 2006 21:53:07 -0000 1.11 ++++ plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 9 Sep 2006 14:39:38 -0000 +@@ -28,6 +28,13 @@ + 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= diff --git a/eclipse.spec b/eclipse.spec index 2f6cc0b..68fa8a0 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -120,7 +120,7 @@ Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch %if %{gcj_support} %else -ExclusiveArch: %{ix86} x86_64 ppc ia64 +ExclusiveArch: %{ix86} x86_64 ppc ia64 sparc sparc64 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -454,11 +454,11 @@ popd %patch55 -p0 rm plugins/org.junit4/junit-4.1.jar -pushd plugins/org.eclipse.swt -mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla +mv "plugins/org.eclipse.swt/Eclipse SWT Mozilla" plugins/org.eclipse.swt/Eclipse_SWT_Mozilla +mv "plugins/org.eclipse.swt.tools/JNI Generation" plugins/org.eclipse.swt.tools/JNI_Generation %patch59 -mv Eclipse_SWT_Mozilla "Eclipse SWT Mozilla" -popd +mv plugins/org.eclipse.swt/Eclipse_SWT_Mozilla "plugins/org.eclipse.swt/Eclipse SWT Mozilla" +mv plugins/org.eclipse.swt.tools/JNI_Generation "plugins/org.eclipse.swt.tools/JNI Generation" # FIXME check if this has been applied upstream pushd plugins/org.eclipse.platform.doc.isv @@ -656,10 +656,10 @@ popd find plugins -name \*.xml -exec sed --in-place "s/\(\)/<\!-- \1 -->/" "{}" \; %endif -# nasty hack to get suppport for ppc64 and s390(x) -# move all of the ia64 directories to ppc64 or s390(x) dirs and replace the ia64 -# strings with ppc64 or s390(x) -%ifarch ppc64 s390 s390x +# nasty hack to get suppport for ppc64, s390(x) and sparc(64) +# move all of the ia64 directories to ppc64 or s390(x) or sparc(64) dirs and replace +# the ia64 strings with ppc64 or s390(x) +%ifarch ppc64 s390 s390x sparc sparc64 # there is only partial support for ppc64 in 3.2 so we have to remove this # partial support to get the replacemnt hack to work find -name \*ppc64\* | xargs rm -r @@ -1602,6 +1602,7 @@ fi %changelog * Thu Sep 07 2006 Ben Konrath 3.2.0-5 - Add swt-firefox patch; moves SWT to NS_InitXPCOM3() from NS_InitEmbedding(). +- Add sparc support (Dennis Gilmore ) * Wed Sep 06 2006 Ben Konrath 3.2.0-4 - Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because