diff --git a/eclipse-config-ini-tweaks.patch b/eclipse-config-ini-tweaks.patch deleted file mode 100644 index 38ed3bf..0000000 --- a/eclipse-config-ini-tweaks.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.orig 2014-11-18 10:35:37.607672861 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2014-11-18 10:45:15.633420274 +0000 -@@ -7,9 +7,9 @@ - - - -- -showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile --launcher.appendVmargs -+ -showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile --launcher.appendVmargs -protect master - -- -Xms40m -Xmx512m -+ -Xms128m -Xmx1024m -Dorg.eclipse.swt.browser.UseWebKitGTK=true -Dhelp.lucene.tokenizer=standard -Declipse.p2.skipMovedInstallDetection=true - - -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - diff --git a/eclipse.spec b/eclipse.spec index 3f144d0..e6b30c7 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -125,9 +125,6 @@ Patch26: %{pkg_name}-feature-plugins-to-category-ius.patch # Make workspace selection dialog visible in the task manager of the OS Patch27: eclipse-workspace-chooser.patch -# Tweaks to the eclipse.ini file -Patch28: eclipse-config-ini-tweaks.patch - BuildRequires: rsync BuildRequires: make, gcc BuildRequires: gtk2-devel @@ -343,7 +340,6 @@ tar --strip-components=1 -xf %{SOURCE1} %patch25 %patch26 %patch27 -p1 -%patch28 #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 @@ -544,6 +540,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 @@ -553,6 +554,8 @@ sed -i '5i--launcher.GTK_version\n2' eclipse.ini # Temporary fix until https://bugs.eclipse.org/294877 is resolved cat >> eclipse.ini < -XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate @@ -560,6 +563,7 @@ cat >> eclipse.ini < - 1:4.4.1-8 - 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 - 1:4.4.1-7