diff --git a/eclipse-fix-jsoup-crash.patch b/eclipse-fix-jsoup-crash.patch deleted file mode 100644 index f626945..0000000 --- a/eclipse-fix-jsoup-crash.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 2013-04-19 13:08:29.315958306 +0200 -+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java.bak 2013-04-19 13:06:32.843978924 +0200 -@@ -597,9 +597,13 @@ public void create (Composite parent, int style) { - */ - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); -- WebKitGTK.soup_session_feature_detach (originalAuth, session); -+ if (originalAuth != 0) { -+ WebKitGTK.soup_session_feature_detach (originalAuth, session); -+ } - OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView); -- WebKitGTK.soup_session_feature_attach (originalAuth, session); -+ if (originalAuth != 0) { -+ WebKitGTK.soup_session_feature_attach (originalAuth, session); -+ } - - /* - * Check for proxy values set as documented java properties and update the diff --git a/eclipse-osgi-unpack-sources.patch b/eclipse-osgi-unpack-sources.patch index 286d4e2..848ae6b 100644 --- a/eclipse-osgi-unpack-sources.patch +++ b/eclipse-osgi-unpack-sources.patch @@ -1,30 +1,94 @@ ---- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak 2012-07-25 17:42:07.000000000 +0200 -+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml 2012-07-30 12:05:54.525785334 +0200 -@@ -42,6 +42,84 @@ - - - -+ -+ org.eclipse.tycho -+ target-platform-configuration -+ -+ +--- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak 2013-05-10 10:19:28.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties 2013-05-10 11:29:48.359120855 +0200 +@@ -11,10 +11,16 @@ + bin.includes = plugin.properties,\ + about.html,\ + META-INF/,\ ++ org/,\ + about_files/ + src.includes = plugin.properties,\ + about.html,\ + about_files/ ++source.. = src/ ++output.. = bin/ + customBuildCallbacks=customBuildCallbacks.xml + javacSource = 1.5 + javacTarget = 1.5 ++jars.compile.order = library.jar,\ ++ src/ ++source.library.jar = src2/ +--- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak 2013-05-10 10:19:28.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml 2013-05-10 11:28:11.292306529 +0200 +@@ -25,64 +25,81 @@ + + + +- org.apache.maven.plugins +- maven-antrun-plugin +- 1.7 +- +- +- prepare-package +- +- +- +- +- +- +- run +- +- +- +- +- + org.eclipse.tycho + target-platform-configuration +- + + +- ignore ++ ignore + + + eclipse-plugin + javax.servlet + 0.0.0 + -+ + -+ -+ -+ -+ + + + + +- org.eclipse.tycho +- tycho-packaging-plugin +- ${tycho.version} +- +- +- +- ${basedir} +- +- org/**/*.class +- +- +- +- +- +- +- org.eclipse.tycho +- tycho-source-plugin +- ${tycho.version} +- +- +- org/**/*.java +- org/**/packageinfo +- +- +- + maven-antrun-plugin + 1.7 + @@ -33,10 +97,13 @@ + process-resources + + -+ ++ ++ + + -+ ++ ++ ++ + + + @@ -48,10 +115,9 @@ + process-classes + + -+ -+ ++ ++ ++ + + + @@ -85,25 +151,3 @@ ---- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak 2012-08-01 16:03:39.000000000 +0200 -+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties 2012-08-01 16:22:16.274724843 +0200 -@@ -11,13 +11,16 @@ - bin.includes = plugin.properties,\ - about.html,\ - META-INF/,\ -- org/,\ -+ org/,\ - about_files/ - src.includes = src.zip,\ - about.html,\ - about_files/ --source.. = . --output.. = . -+source.. = src/ -+output.. = bin/ - customBuildCallbacks=customBuildCallbacks.xml - javacSource = 1.5 - javacTarget = 1.5 -+jars.compile.order = library.jar,\ -+ src/ -+source.library.jar = src2/ diff --git a/eclipse-remove-loop-predicate.patch b/eclipse-remove-loop-predicate.patch deleted file mode 100644 index 4188ec3..0000000 --- a/eclipse-remove-loop-predicate.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 228b38bf70d970e9aeb0aa3a9430b0067395eec8 Mon Sep 17 00:00:00 2001 -From: Krzysztof Daniel -Date: Wed, 24 Apr 2013 14:06:58 +0200 -Subject: [PATCH] Don't use -XX:-UseLoopPredicate - -It was necessary to use it when Java had a loop bug, which was fixed in -the first update. - -https://bugs.eclipse.org/bugs/show_bug.cgi?id=406419 ---- - eclipse-platform-parent/pom.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml -index 0bf154a..7ecf4b7 100644 ---- eclipse-platform-parent/pom.xml -+++ eclipse-platform-parent/pom.xml -@@ -615,7 +615,7 @@ - - - -- -XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard -+ -Dhelp.lucene.tokenizer=standard - - -data target/apibuild-workspace -application org.eclipse.ant.core.antRunner -buildfile target/.apibuild.xml - --- -1.8.1.4 -From 5327d8805d99af55044cd1c52422141c7948c6a3 Mon Sep 17 00:00:00 2001 -From: Krzysztof Daniel -Date: Wed, 24 Apr 2013 13:54:47 +0200 -Subject: [PATCH] Don't use -XX:-UseLoopPredicate - -It was necessary to use it when Java had a loop bug, which was fixed in -the first update. - -https://bugs.eclipse.org/bugs/show_bug.cgi?id=406419 ---- - bundles/org.eclipse.jdt.doc.isv/pom.xml | 2 +- - bundles/org.eclipse.pde.doc.user/pom.xml | 2 +- - bundles/org.eclipse.platform.doc.isv/pom.xml | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml -index 06e4eec..0e7602e 100644 ---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml -+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml -@@ -98,7 +98,7 @@ - - false - -- -XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard -+ -Dhelp.lucene.tokenizer=standard - - -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -Dbasedir.properties=cbi_basedirs.properties - -diff --git eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml -index 9731b09..fdc08bf 100644 ---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml -+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml -@@ -91,7 +91,7 @@ - compile - - false -- -XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard -+ -Dhelp.lucene.tokenizer=standard - -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -Dbasedir.properties=cbi_basedirs.properties - - -diff --git eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -index 81a851a..97431ea 100644 ---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -@@ -248,7 +248,7 @@ - - false - -- -XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard -+ -Dhelp.lucene.tokenizer=standard - - -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -Dbasedir.properties=cbi_basedirs.properties - --- -1.8.1.4 diff --git a/eclipse.spec b/eclipse.spec index 311a200..71c15eb 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -10,7 +10,7 @@ Epoch: 1 %global eclipse_micro 0 %global initialize 1 %global eb_commit b963e34cbd5ead603a051b7d4b79fc91114ccd87 -%global eclipse_tag 2caa8794a57a9479ad642d7f6e3607a020aa36e0 +%global eclipse_tag 05399d45ad26182e90acf47798283268aaeb4471 %global build_id I20130128-1400 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro} %global installation_loc %{_libdir}/%{pkg_name} @@ -52,7 +52,7 @@ fi; Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.43%{?dist} +Release: 0.44.git4bccf2%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -118,12 +118,8 @@ Patch22: %{pkg_name}-bug-903537.patch Patch23: %{pkg_name}-jetty-9.patch -#Patch24: %{pkg_name}-fix-jsoup-crash.patch - Patch25: %{pkg_name}-fix-startup-class-refresh.patch -Patch26: %{pkg_name}-remove-loop-predicate.patch - BuildRequires: ant >= 1.8.3 BuildRequires: rsync BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -343,7 +339,6 @@ tar --strip-components=1 -xf %{SOURCE1} %{!?scl:%patch23} #%patch24 %patch25 -%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 @@ -472,8 +467,7 @@ find eclipse.platform.common/bundles -name pom.xml -exec sed -i -e "s@http://dow find eclipse.platform.swt/bundles -name pom.xml -exec sed -i -e "s@http://download.eclipse.org/eclipse/updates/4.2@${LOCALREPO}@g" {} \; sed -i -e "s@http://download.eclipse.org/releases/juno@${LOCALREPO}@g" eclipse-platform-parent/pom.xml -sed -i -e "s@linux/x86_64/@linux/@g" eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml -sed -i -e "s/httpclient/httpclient4/g" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml + %{_javadir}/tycho/copy-platform-all $(pwd)/.m2/p2/repo %build @@ -774,8 +768,10 @@ fi %{_libdir}/%{pkg_name}/eclipse %dir %{_libdir}/%{pkg_name}/dropins %dir %{_datadir}/%{pkg_name}/dropins +%dir %{_libdir}/%{pkg_name}/configuration/ %{_libdir}/%{pkg_name}/configuration/config.ini %{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info +%dir %{_libdir}/%{pkg_name}/features/ %{_libdir}/%{pkg_name}/features/org.eclipse.platform_* %{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_* %{_libdir}/%{pkg_name}/features/org.eclipse.rcp_* @@ -967,6 +963,7 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.update.configurator_* +%dir %{_libdir}/%{pkg_name}/readme %{_libdir}/%{pkg_name}/readme/readme_eclipse.html # Put this in -platform since we're putting the p2 stuff here %{_libdir}/%{pkg_name}/artifacts.xml @@ -995,6 +992,10 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %changelog +* Mon May 13 2013 Krzysztof Daniel 1:4.3.0-0.44.git4bccf2 +- Fix the build on secondary platforms. +- Update to latest upstream. + * Mon May 13 2013 Alexander Kurtakov 1:4.3.0-0.43 - Fix the eclipse-rcp obsolete version. diff --git a/get-eclipse.sh b/get-eclipse.sh index 766ca2b..9ca3db8 100755 --- a/get-eclipse.sh +++ b/get-eclipse.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git -TAG=2caa8794a57a9479ad642d7f6e3607a020aa36e0 +TAG=05399d45ad26182e90acf47798283268aaeb4471 #source http://www.linuxjournal.com/content/normalizing-path-names-bash function normalize()