From 1a78a8131811d0725ba62245b0e06166681fb992 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mar 18 2015 12:23:52 +0000 Subject: Update to latest I-build --- diff --git a/eclipse-fix-comaptibility-class.patch b/eclipse-fix-comaptibility-class.patch index b9687dd..fa97a3a 100644 --- a/eclipse-fix-comaptibility-class.patch +++ b/eclipse-fix-comaptibility-class.patch @@ -1,6 +1,6 @@ --- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.orig 2013-01-28 12:14:02.000000000 +0100 +++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2013-01-29 11:02:15.865494675 +0100 -@@ -28,4 +28,57 @@ +@@ -28,4 +28,35 @@ @@ -30,28 +30,6 @@ + + + -+ -+ -+ bsf -+ bsf -+ 2.4.0 -+ -+ -+ rhino -+ js -+ 1.7R2 -+ -+ -+ org.apache.ant -+ ant-apache-bsf -+ 1.8.3 -+ -+ -+ org.apache.ant -+ ant-nodeps -+ 1.8.1 -+ -+ + + + diff --git a/eclipse-lucene-4.patch b/eclipse-lucene-4.patch index 99b269a..805949b 100644 --- a/eclipse-lucene-4.patch +++ b/eclipse-lucene-4.patch @@ -156,7 +156,7 @@ index 9cc690e..6449adb 100644 Reader reader = new StringReader(text); - TokenStream tStream = analyzer.tokenStream(fieldName, reader); -- CharTermAttribute termAttribute = (CharTermAttribute) tStream.getAttribute(CharTermAttribute.class); +- CharTermAttribute termAttribute = tStream.getAttribute(CharTermAttribute.class); + TokenStream tStream = null; try { + tStream = analyzer.tokenStream(fieldName, reader); diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch index 310e9d6..61b821d 100644 --- a/eclipse-no-source-for-dependencies.patch +++ b/eclipse-no-source-for-dependencies.patch @@ -27,7 +27,7 @@ --- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200 +++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200 -@@ -53,6 +53,17 @@ +@@ -34,6 +34,17 @@ source-feature @@ -144,8 +144,8 @@ ---- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.bak 2013-03-14 11:18:11.000000000 +0100 -+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2013-03-14 13:00:08.498377327 +0100 +--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2015-03-18 09:32:34.661736950 +0000 ++++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2015-03-18 09:33:37.948838036 +0000 @@ -11,31 +11,12 @@ bin.includes=feature.xml,feature.properties @@ -158,8 +158,8 @@ -plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\ -plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\ exclude@org.eclipse.jdt.doc.user --generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user -+generate.feature@org.eclipse.pde.source=org.eclipse.pde,\exclude@org.eclipse.pde.doc.user +-generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",exclude@org.eclipse.pde.doc.user ++generate.feature@org.eclipse.pde.source=org.eclipse.pde,exclude@org.eclipse.pde.doc.user generate.feature@org.eclipse.cvs.source=org.eclipse.cvs -generate.feature@org.eclipse.help.source=org.eclipse.help,\ - plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\ @@ -177,9 +177,8 @@ - plugin@org.eclipse.jetty.servlet.source;version=8.1.9.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.util.source;version=8.1.9.qualifier;unpack="false",\ - plugin@javax.el.source;version=2.2.0.qualifier;unpack="false" -- +generate.feature@org.eclipse.help.source=org.eclipse.help -+ + generatedVersionLength=45 --- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300 +++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300 diff --git a/eclipse-webkit2-support.patch b/eclipse-webkit2-support.patch index 0380f10..9f9c549 100644 --- a/eclipse-webkit2-support.patch +++ b/eclipse-webkit2-support.patch @@ -752,7 +752,7 @@ diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/o index 7ef6236..0e00c09 100644 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java -@@ -11,12 +11,15 @@ +@@ -12,12 +12,15 @@ package org.eclipse.swt.browser; @@ -1427,7 +1427,7 @@ index 7ef6236..0e00c09 100644 + // Extract it. int index = ((Double)convertToJava (ctx, result[0])).intValue (); result[0] = 0; - Object key = new Integer (index); + Integer key = new Integer (index); + + // The second argument is a String that is equal to the token of the function. C.memmove (result, arguments + C.PTR_SIZEOF, C.PTR_SIZEOF); diff --git a/eclipse.spec b/eclipse.spec index 7a5212b..dda18c1 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -13,7 +13,7 @@ Epoch: 1 %global eclipse_minor 5 %global eclipse_micro 0 %global eb_commit 2775b93d3d9f147f5711c91bb3aa623f2582019d -%global eclipse_tag I20150303-0800 +%global eclipse_tag I20150317-2000 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro} %global _jetty_version 9.2.9 @@ -38,7 +38,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.4.git201503030800%{?dist} +Release: 0.5.git201503172000%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -1016,6 +1016,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Tue Mar 17 2015 Mat Booth - 1:4.5.0-0.5.git201503172000 +- Update to latest I-build + * Wed Mar 04 2015 Mat Booth - 1:4.5.0-0.4.git201503030800 - Update to latest I-build - JDT requires only hamcrest-core diff --git a/get-eclipse.sh b/get-eclipse.sh index 41fae20..98c489b 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=I20150303-0800 +TAG=I20150317-2000 rm -rf R4_platform-aggregator-$TAG rm -rf R4_platform-aggregator-$TAG.tar.xz diff --git a/sources b/sources index 7520166..b73da23 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -deb5f8b222b17a88b3d15cbacef557cd R4_platform-aggregator-I20150303-0800.tar.xz +5ba2f92104250a33a76afebc760d49e0 R4_platform-aggregator-I20150317-2000.tar.xz 1497147a427b98a00a87263880063294 org.eclipse.linuxtools.eclipse-build-2775b93d3d9f147f5711c91bb3aa623f2582019d.tar.bz2