- Bump maximum heap size from 256 MB to 512 MB.

- Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092 (which
    is really http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100).
- Some jiggery-pokery for spaces in SWT paths for buildagainstxulrunner
    patch.
This commit is contained in:
Andrew Overholt 2008-04-25 16:55:36 +00:00
parent 3a4de59732
commit 1836a478cf
4 changed files with 37 additions and 16 deletions

View File

@ -1,12 +1,12 @@
### Eclipse Workspace Patch 1.0
#P org.eclipse.swt
Index: Eclipse SWT PI/gtk/library/build.sh
Index: Eclipse_SWT_PI/gtk/library/build.sh
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/build.sh,v
retrieving revision 1.46
diff -u -r1.46 build.sh
--- Eclipse SWT PI/gtk/library/build.sh 22 Oct 2007 21:18:51 -0000 1.46
+++ Eclipse SWT PI/gtk/library/build.sh 9 Apr 2008 19:45:37 -0000
--- Eclipse_SWT_PI/gtk/library/build.sh 22 Oct 2007 21:18:51 -0000 1.46
+++ Eclipse_SWT_PI/gtk/library/build.sh 9 Apr 2008 19:45:37 -0000
@@ -103,8 +103,14 @@
export MOZILLA_INCLUDES
export MOZILLA_LIBS

View File

@ -1,8 +0,0 @@
diff -ur features/org.eclipse.platform/gtk/eclipse.ini features/org.eclipse.platform/gtk/eclipse.ini
--- features/org.eclipse.platform/gtk/eclipse.ini 2007-11-02 12:23:06.000000000 -0400
+++ features/org.eclipse.platform/gtk/eclipse.ini 2007-11-02 12:21:23.000000000 -0400
@@ -3,3 +3,4 @@
-vmargs
-Xms40m
-Xmx256m
+-XX:MaxPermSize=128m

View File

@ -0,0 +1,11 @@
diff -ur features/org.eclipse.platform/gtk/eclipse.ini patched/features/org.eclipse.platform/gtk/eclipse.ini
--- features/org.eclipse.platform/gtk/eclipse.ini 2008-04-25 12:25:26.000000000 -0400
+++ features/org.eclipse.platform/gtk/eclipse.ini 2008-04-25 12:26:04.000000000 -0400
@@ -2,4 +2,6 @@
org.eclipse.platform
-vmargs
-Xms40m
--Xmx256m
+-Xmx512m
+-XX:MaxPermSize=128m
+-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith

View File

@ -20,7 +20,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 9%{?dist}
Release: 10%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -84,11 +84,19 @@ Patch26: %{name}-launcher-fix-java-home.patch
# On a 1.7 VM, generate 1.6-level bytecode
# https://bugzilla.redhat.com/show_bug.cgi?id=288991
Patch27: %{name}-17vmgenerate16bytecode.patch
# Default max heap size too low for lots of people. Bumping to 512 MB.
# Max perm size:
# https://bugzilla.redhat.com/show_bug.cgi?id=352361
Patch29: %{name}-maxpermsize.patch
# JVM crash:
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
Patch29: %{name}-memorypermsizeandjvmcrash.patch
Patch31: %{name}-ia64-packaging.patch
# https://bugs.eclipse.org/226356
# Note: I made this patch from within Eclipse and then did the following to
# it due to spaces in the paths:
# sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-buildagainstxulrunner.patch
Patch32: %{name}-buildagainstxulrunner.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -610,8 +618,10 @@ for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
done
# Build mozilla bindings against xulrunner
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI
%patch32 -p1
pushd plugins/org.eclipse.swt
mv "Eclipse SWT PI" Eclipse_SWT_PI
%patch32
mv Eclipse_SWT_PI "Eclipse SWT PI"
popd
@ -1642,6 +1652,14 @@ fi
%endif
%changelog
* Fri Apr 25 2008 Andrew Overholt <overholt@redhat.com> 3.3.2-10
- Bump maximum heap size from 256 MB to 512 MB.
- Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
(which is really
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100).
- Some jiggery-pokery for spaces in SWT paths for buildagainstxulrunner
patch.
* Wed Apr 09 2008 Andrew Overholt <overholt@redhat.com> 3.3.2-9
- Fix patch level for xulrunner build patch.