[eclipse] - Add patch to fix xpcom problem.

[Jeff Johnston]

commit 89854db15fe1ca46b52353b68eeec3748cf13be2
Author: Jeff Johnston <jjohnstn at torro.(none)>
Date:   Fri Sep 17 14:04:48 2010 -0400

    - Add patch to fix xpcom problem.

 eclipse-xpcom-h.patch |   14 ++++++++++++++
 eclipse.spec          |   16 +++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/eclipse-xpcom-h.patch b/eclipse-xpcom-h.patch
new file mode 100644
index 0000000..e2dfbc4
--- /dev/null
+++ b/eclipse-xpcom-h.patch
@@ -0,0 +1,14 @@
+diff -up ./xpcom.h.fix ./xpcom.h
+--- ./xpcom.h.fix	2010-09-17 11:31:46.317620889 -0400
++++ ./xpcom.h	2010-09-17 11:33:58.558646774 -0400
+@@ -36,6 +36,10 @@
+ #ifdef __APPLE__
+ #define NO__1NS_1InitXPCOM2
+ #endif /* __APPLE__ */
++#ifdef __linux__
++#define NO__1Call__IIIIII
++#define NO__1Call__JJJJJI
++#endif /* __linux__ */
+ #endif /* _WIN32 */
+ 
+ #define SWT_XREInitEmbedding nsresult (*)(nsILocalFile *,nsILocalFile *,nsIDirectoryServiceProvider *,nsStaticModuleInfo const *,PRUint32)
diff --git a/eclipse.spec b/eclipse.spec
index 531ee6c..b0f661a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -38,6 +38,10 @@ Source17:       efj.sh.in
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 Patch0:         remove-ant-trax.patch
+# Patch to allow xpcom.cpp to build under latest xulrunner which has removed
+# a particular API and a type it depends on so we don't want to compile that
+# API
+Patch1:         eclipse-xpcom-h.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps
@@ -58,7 +62,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
-BuildRequires:  xulrunner-devel
+BuildRequires:  xulrunner-devel >= 1.9.3
 BuildRequires:  webkitgtk-devel
 
 %if !%{bootstrap}
@@ -93,7 +97,7 @@ Group:          Text Editors/Integrated Development Environments (IDE)
 # %{_libdir}/java directory owned by jpackage-utils
 Requires:       jpackage-utils
 Requires:       gtk2
-Requires:       xulrunner >= 1.9
+Requires:       xulrunner >= 1.9.3
 Requires:       webkitgtk
 Conflicts:      mozilla
 Provides:       libswt3-gtk2 = 1:%{version}-%{release}
@@ -185,6 +189,9 @@ ant -DbuildArch=%{eclipse_arch} applyPatches
 sed -i -e "s|org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar||g" nonosgidependencies.properties
 pushd build/eclipse-%{version}-src
 %patch0
+pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/
+%patch1
+popd
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
@@ -584,6 +591,9 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Sep 17 2010 Jeff Johnston <jjohnstn at redhat.com> 1:3.6.0-10
+- Add patch to fix xpcom problem.
+
 * Tue Sep 7 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.6.0-9
 - Add webkitgtk-devel BR and webkit R.