- Add patch to fix xpcom problem.
This commit is contained in:
parent
37dcc010f2
commit
89854db15f
14
eclipse-xpcom-h.patch
Normal file
14
eclipse-xpcom-h.patch
Normal file
@ -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)
|
16
eclipse.spec
16
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@redhat.com> 1:3.6.0-10
|
||||
- Add patch to fix xpcom problem.
|
||||
|
||||
* Tue Sep 7 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.0-9
|
||||
- Add webkitgtk-devel BR and webkit R.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user