rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Build with XULRunner-specific flags since we're building against 

XULRunner.
This commit is contained in:
Andrew Overholt 2009-03-16 18:14:14 +00:00
parent 8526d1d50f
commit 908669eab7
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eclipse-swt-buildagainstxulrunner.patch Normal file
View File

@ -0,0 +1,26 @@
### Eclipse Workspace Patch 1.0
#P org.eclipse.swt
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.50
diff -u -r1.50 build.sh
--- Eclipse SWT PI/gtk/library/build.sh 23 Jan 2009 23:22:21 -0000 1.50
+++ Eclipse SWT PI/gtk/library/build.sh 5 Mar 2009 20:41:43 -0000
@@ -107,11 +107,11 @@
export MOZILLA_LIBS
MAKE_MOZILLA=make_mozilla
elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
- MOZILLA_INCLUDES=`pkg-config --cflags libxul`
- MOZILLA_LIBS=`pkg-config --libs libxul`
- export MOZILLA_INCLUDES
- export MOZILLA_LIBS
- MAKE_MOZILLA=make_mozilla
+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
+ XULRUNNER_LIBS=`pkg-config --libs libxul`
+ export XULRUNNER_INCLUDES
+ export XULRUNNER_LIBS
+ MAKE_MOZILLA=make_xulrunner
else
echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
echo " *** Mozilla embedding support will not be compiled."

14
eclipse.spec
View File

@ -29,7 +29,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 3%{?dist}
Release: 4%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -147,6 +147,11 @@ Patch42: %{name}-tests-libraryXml.patch
Patch43: %{name}-osgi-classpath.patch
Patch44: %{name}-fix-javahome64.patch
# Since we're building against XULRunner, build using XR flags
# https://bugs.eclipse.org/226356
# https://bugzilla.redhat.com/show_bug.cgi?id=484453
Patch45: %{name}-swt-buildagainstxulrunner.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@ -347,6 +352,10 @@ popd
#%patch40
#popd
pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
%patch45 -p3
popd
# Remove signatures for JARs
find -iname \*.sf | xargs rm
find -iname \*.rsa | xargs rm
@ -1472,6 +1481,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Mon Mar 16 2009 Andrew Overholt <overholt@redhat.com> 1:3.4.2-4
- Build with XULRunner-specific flags since we're building against XULRunner.
* Mon Mar 9 2009 Andrew Overholt <overholt@redhat.com> 1:3.4.2-3
- Remove ecj sub-package as it is replaced by standalone ecj package.