[eclipse/f21] Don't change eclipse.ini with a patch, it doesn't work

[Mat Booth]

commit c85a5a185ff68ebf1317c0bd22b11ca0d09255e0
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Nov 18 14:00:44 2014 +0000

    Don't change eclipse.ini with a patch, it doesn't work

 eclipse-config-ini-tweaks.patch |   14 --------------
 eclipse.spec                    |   13 +++++++++----
 2 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 26705d4..7b91009 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -117,9 +117,6 @@ Patch24:        %{pkg_name}-bug-444143.patch
 # Make workspace selection dialog visible in the task manager of the OS
 Patch25:        eclipse-workspace-chooser.patch
 
-# Tweaks to the eclipse.ini file
-Patch26:        eclipse-config-ini-tweaks.patch
-
 BuildRequires: rsync
 BuildRequires: make, gcc
 BuildRequires: gtk2-devel
@@ -333,7 +330,6 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch23
 %patch24 -p1
 %patch25 -p1
-%patch26
 
 #Disable as many things as possible to make the build faster. We care only for Eclipse.
 %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -539,6 +535,11 @@ pushd p2/org.eclipse.equinox.p2.engine/.settings
     sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
 popd
 
+# ini file adjustements
+sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
+sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
+sed -i '1i-protect\nmaster' eclipse.ini
+
 # Use GTK3 by default on F22 or newer
 %if 0%{?fedora} >= 22
 sed -i '5i--launcher.GTK_version\n3' eclipse.ini
@@ -548,6 +549,8 @@ sed -i '5i--launcher.GTK_version\n2' eclipse.ini
 
 # Temporary fix until https://bugs.eclipse.org/294877 is resolved
 cat >> eclipse.ini <<EOF
+-Dorg.eclipse.swt.browser.UseWebKitGTK=true
+-Dhelp.lucene.tokenizer=standard
 -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
 -XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
 -XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
@@ -555,6 +558,7 @@ cat >> eclipse.ini <<EOF
 -XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
 -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
 -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{?_scl_root}/usr/share/eclipse/dropins
+-Declipse.p2.skipMovedInstallDetection=true
 EOF
 
 popd #eclipse
@@ -1009,6 +1013,7 @@ fi
 %changelog
 * Mon Nov 17 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.1-6
 - Increase max heap size to 1024m
+  - But don't do this as a patch, it doesn't work
 - Fix build ID to always be lexigraphically higher that upstream
 
 * Wed Nov 12 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.1-5