From 294211a14a1ac196f36f550137f92460a7289ca6 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Apr 24 2013 12:21:31 +0000 Subject: - Fix generating tests summary. - RHBZ 955214 Failure to properly start bundle on first run. - Eclipse Bug 406419 - Don't use -XX:-UseLoopPredicate --- diff --git a/.gitignore b/.gitignore index 18ebd58..8f8cf97 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,7 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz /eclipse-build-3f54ce82ff1310076f964b1ba41cc98888fb1f5e.tar.xz /eclipse-build-d6063a02c1c32de4b1a262ba8a8da02bed578524.tar.xz /eclipse-build-10c860962dcb748ecbdf92140f1d4f64511f0a88.tar.xz +/eclipse-build-1000a3a78bc1685a00faf9ebfa9cc4dbf530d3e0.tar.xz +/eclipse-build-62df1461d353e168d9cd713385bbe27b7ea66f4b.tar.xz +/.m2 +/.xmvn diff --git a/eclipse-fix-startup-class-refresh.patch b/eclipse-fix-startup-class-refresh.patch new file mode 100644 index 0000000..36c1404 --- /dev/null +++ b/eclipse-fix-startup-class-refresh.patch @@ -0,0 +1,7 @@ +--- rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF.bak 2013-03-14 11:36:30.000000000 +0100 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF 2013-04-23 19:28:14.777666704 +0200 +@@ -35,3 +35,4 @@ + Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2 + Eclipse-LazyStart: true + Bundle-ActivationPolicy: lazy ++Require-Capability: osgi.identity; filter:="(osgi.identity=org.eclipse.core.runtime)"; resolution:=optional diff --git a/eclipse-remove-loop-predicate.patch b/eclipse-remove-loop-predicate.patch new file mode 100644 index 0000000..4188ec3 --- /dev/null +++ b/eclipse-remove-loop-predicate.patch @@ -0,0 +1,84 @@ +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-test-support.patch b/eclipse-test-support.patch index 910e5fe..6d903c4 100644 --- a/eclipse-test-support.patch +++ b/eclipse-test-support.patch @@ -311,27 +311,28 @@ + + -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ + -+ -+ -+ -+ <testsuites> -+ -+ -+ -+ </testsuites> -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/eclipse.spec b/eclipse.spec index 88b7924..7ff943d 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -9,7 +9,7 @@ Epoch: 1 %global eclipse_majmin %{eclipse_major}.%{eclipse_minor} %global eclipse_micro 0 %global initialize 1 -%global eb_commit 10c860962dcb748ecbdf92140f1d4f64511f0a88 +%global eb_commit 62df1461d353e168d9cd713385bbe27b7ea66f4b %global build_id I20130128-1400 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro} %global installation_loc %{_libdir}/%{pkg_name} @@ -51,7 +51,7 @@ fi; Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.39%{?dist} +Release: 0.40%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -125,6 +125,10 @@ 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 @@ -345,6 +349,8 @@ tar --strip-components=1 -xf %{SOURCE1} %patch22 %{!?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 @@ -744,6 +750,7 @@ sed -i "s@/usr/share/eclipse@%{libdir}/%{pkg_name}@" $RPM_BUILD_ROOT%{_libdir}/% unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/ unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing cp eclipse.platform.releng/bundles/org.eclipse.test/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing +cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat @@ -757,7 +764,7 @@ rm -rf org.junit4_* popd sed -i -e "s#@libdir@#%{_libdir}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh - +sed -i -e "s#@USR@#%{?scl:%{_scl_root}}%{_usr}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh touch $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-runEclipsePackageTests chmod a+x $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests echo '#!/bin/sh' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests @@ -1031,6 +1038,11 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Apr 23 2013 Krzysztof Daniel 1:4.3.0-0.40 +- Fix generating tests summary. +- RHBZ 955214 Failure to properly start bundle on first run. +- Eclipse Bug 406419 - Don't use -XX:-UseLoopPredicate + * Mon Apr 22 2013 Krzysztof Daniel 1:4.3.0-0.39 - Include a fix for a crash in libsoup/webkitgtk-2.x diff --git a/sources b/sources index ef799fc..b5eb8cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d9507436cbfc69c350292192c9f9ff57 eclipse-build-10c860962dcb748ecbdf92140f1d4f64511f0a88.tar.xz +f3ae800f0031319549a51cf8cec51346 eclipse-build-62df1461d353e168d9cd713385bbe27b7ea66f4b.tar.xz 9984cb673e1a7995bf52c33af260b61c eclipse-source.tar.bz2