[eclipse] Update to latest 4.5.0 I-build
Mat Booth
mbooth at fedoraproject.org
Thu Feb 12 14:38:32 UTC 2015
commit 365159b3a7e268cf55903a5cd6658336f9d97af4
Author: Mat Booth <mat.booth at redhat.com>
Date: Fri Jan 30 10:05:27 2015 +0000
Update to latest 4.5.0 I-build
- Drop upstreamed jetty9/servlet and workspace picker patches
- Drop upstreamed patches for bug 903537 and bug 444143
- Update eclipse-build snapshot for ant dependency
- Ship missing features used by some other projects' target platform
- Build with mvn_build macro
- Some spec file clean-up
eclipse-bug-386377.patch | 259 ++----------
eclipse-bug-444143.patch | 96 ----
eclipse-bug-903537.patch | 16 -
eclipse-change-build-packagings.patch | 5 +-
eclipse-feature-plugins-to-category-ius.patch | 12 +-
eclipse-help-doc-adjust-dependencies.patch | 2 +-
eclipse-jetty-9.patch | 599 -------------------------
eclipse-lucene-4.patch | 28 ++
eclipse-mockito.patch | 12 +-
eclipse-no-source-for-dependencies.patch | 18 +-
eclipse-no-target-platform.patch | 14 +-
eclipse-policy-comparators.patch | 6 +-
eclipse-remove-jgit-provider.patch | 8 +-
eclipse-secondary-arches.patch | 151 ++-----
eclipse-servlet-3.1.patch | 43 --
eclipse-test-support.patch | 58 +--
eclipse-webkit2-support.patch | 44 --
eclipse-workspace-chooser.patch | 28 --
eclipse.spec | 93 ++---
get-eclipse.sh | 5 +-
sources | 4 +-
21 files changed, 189 insertions(+), 1312 deletions(-)
---
diff --git a/eclipse-bug-386377.patch b/eclipse-bug-386377.patch
index 29dfe95..c912db5 100644
--- a/eclipse-bug-386377.patch
+++ b/eclipse-bug-386377.patch
@@ -1,11 +1,11 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
+@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>x86_64</arch>
</properties>
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.x86_64</id>
+ <activation>
+ <property>
@@ -17,7 +17,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -32,28 +32,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -62,13 +40,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
<ws>win32</ws>
<arch>x86_64</arch>
</properties>
-+
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-win32.win32.x86_64</id>
+ <activation>
+ <property>
@@ -80,7 +57,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -95,28 +72,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -125,13 +80,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2014-04-16 15:57:26.204834155 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>ppc64le</arch>
</properties>
-+
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.ppc64le</id>
+ <activation>
+ <property>
@@ -143,7 +97,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -158,28 +112,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -188,12 +120,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
+@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>x86</arch>
</properties>
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.x86</id>
+ <activation>
+ <property>
@@ -205,7 +137,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -220,28 +152,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -250,13 +160,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
<ws>win32</ws>
<arch>x86</arch>
</properties>
-+
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-win32.win32.x86</id>
+ <activation>
+ <property>
@@ -268,7 +177,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -283,28 +192,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -313,13 +200,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>s390</arch>
</properties>
-+
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.s390</id>
+ <activation>
+ <property>
@@ -331,7 +217,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -346,28 +232,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -376,13 +240,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>s390x</arch>
</properties>
-+
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.s390x</id>
+ <activation>
+ <property>
@@ -394,7 +257,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -409,28 +272,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -439,13 +280,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 2014-04-16 15:57:28.315796703 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>ppc64</arch>
</properties>
-+
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.ppc64</id>
+ <activation>
+ <property>
@@ -457,7 +297,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -472,28 +312,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@@ -502,13 +320,12 @@
</project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
<ws>gtk</ws>
<arch>ppc</arch>
</properties>
-+
+ <profiles>
-+ <profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.ppc</id>
+ <activation>
+ <property>
@@ -520,7 +337,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version> 1.7 </version>
++ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@@ -535,28 +352,6 @@
+ </goals>
+ </execution>
+ </executions>
-+ <dependencies>
-+ <dependency>
-+ <groupId>bsf</groupId>
-+ <artifactId>bsf</artifactId>
-+ <version>2.4.0</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>rhino</groupId>
-+ <artifactId>js</artifactId>
-+ <version>1.7R2</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-apache-bsf</artifactId>
-+ <version>1.8.3</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-nodeps</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
-+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 86f3ff8..ce3606f 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -20,7 +20,7 @@
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2014-04-22 19:03:17.404382093 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2014-04-22 19:08:40.599989429 +0100
-@@ -4,33 +4,21 @@
+@@ -4,24 +4,15 @@
id="org.eclipse.sdk.tests"
version="0.0.0" />
<feature
@@ -42,9 +42,10 @@
- id="org.eclipse.releng.tools"
- version="0.0.0" />
- <feature
- id="org.eclipse.equinox.executable"
+ id="org.eclipse.swt.tools.feature"
version="0.0.0" />
<feature
+@@ -31,9 +22,6 @@
id="org.eclipse.sdk"
version="0.0.0" />
<feature
diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch
index b501bfd..9f15711 100644
--- a/eclipse-feature-plugins-to-category-ius.patch
+++ b/eclipse-feature-plugins-to-category-ius.patch
@@ -223,7 +223,7 @@ index 8176831..c97bab0 100644
- id="org.apache.batik.css"
- download-size="0"
- install-size="0"
-- version="1.7.0.qualifier"
+- version="0.0.0"
- unpack="false"/>
-
- <plugin
@@ -237,28 +237,28 @@ index 8176831..c97bab0 100644
- id="org.apache.batik.util"
- download-size="0"
- install-size="0"
-- version="1.7.0.qualifier"
+- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.svg"
- download-size="0"
- install-size="0"
-- version="1.1.0.qualifier"
+- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.smil"
- download-size="0"
- install-size="0"
-- version="1.0.0.qualifier"
+- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.events"
- download-size="0"
- install-size="0"
-- version="3.0.0.qualifier"
+- version="0.0.0"
- unpack="false"/>
-
- <plugin
@@ -286,7 +286,7 @@ index 8176831..c97bab0 100644
- id="org.apache.batik.util.gui"
- download-size="0"
- install-size="0"
-- version="1.7.0.qualifier"
+- version="0.0.0"
- unpack="false"/>
-
- <plugin
diff --git a/eclipse-help-doc-adjust-dependencies.patch b/eclipse-help-doc-adjust-dependencies.patch
index d6593ea..0ebc21e 100644
--- a/eclipse-help-doc-adjust-dependencies.patch
+++ b/eclipse-help-doc-adjust-dependencies.patch
@@ -27,6 +27,6 @@ index 12beb8e..e20ea19 100644
+ org.apache.lucene.index;version="[3.5.0,5.0.0)",
+ org.apache.lucene.search;version="[3.5.0,5.0.0)",
+ org.apache.lucene.store;version="[3.5.0,5.0.0)"
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.ua.tests,
org.eclipse.ua.tests.browser,
diff --git a/eclipse-lucene-4.patch b/eclipse-lucene-4.patch
index e008540..6fe1d3f 100644
--- a/eclipse-lucene-4.patch
+++ b/eclipse-lucene-4.patch
@@ -446,3 +446,31 @@ index 1360599..f622417 100644
/// Unlikely to be called as this is a reused
if (this.reader != null) {
this.reader.close();
+--- a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java 2014-11-29 17:08:45.937034662 +0000
++++ b/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java 2014-11-29 17:12:29.324984554 +0000
+@@ -23,6 +23,7 @@
+ import org.osgi.framework.Bundle;
+
+ import org.apache.lucene.index.CorruptIndexException;
++import org.apache.lucene.index.DirectoryReader;
+ import org.apache.lucene.search.IndexSearcher;
+ import org.apache.lucene.search.Query;
+ import org.apache.lucene.search.TopDocs;
+@@ -155,7 +156,7 @@
+ IndexSearcher searcher = null;
+ try {
+ luceneDirectory = new NIOFSDirectory(new File(filePath));
+- searcher = new IndexSearcher(luceneDirectory, true);
++ searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
+ TopDocs hits = searcher.search(luceneQuery, 500);
+ assertEquals(hits.totalHits, 1);
+ } finally {
+@@ -165,7 +166,7 @@
+ } catch (IOException x) {
+ }
+ if (searcher != null)
+- searcher.close();
++ searcher.getIndexReader().close();
+ }
+ } else {
+ fail("Cannot resolve to file protocol");
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index 74e51ee..61ea200 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -1,44 +1,38 @@
--- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000
+++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000
-@@ -43,9 +43,9 @@
+@@ -42,8 +42,8 @@
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
org.eclipse.osgi.services;bundle-version="3.3.100",
- org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
- org.mockito;bundle-version="1.8.4"
+ org.hamcrest.core,
-+ org.objenesis,
+ org.mockito.mockito-core
Eclipse-AutoStart: true
Export-Package: org.eclipse.ui.tests.api,
org.eclipse.ui.tests.menus
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:44:04.400306048 +0000
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:58:07.608331033 +0000
-@@ -31,9 +31,9 @@
+@@ -31,8 +31,8 @@
org.eclipse.core.expressions;bundle-version="3.4.200",
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
- org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
- org.mockito;bundle-version="1.8.4",
+ org.hamcrest.core,
-+ org.objenesis,
+ org.mockito.mockito-core,
org.eclipse.e4.ui.css.core;bundle-version="0.10.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig 2014-04-22 14:31:35.155774270 +0100
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF 2014-04-22 14:33:47.599498477 +0100
-@@ -10,9 +10,9 @@
+@@ -10,8 +10,8 @@
org.w3c.css.sac,
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
org.eclipse.ui;bundle-version="3.106.0",
- org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
- org.mockito;bundle-version="1.8.4",
+ org.hamcrest.core,
-+ org.objenesis,
+ org.mockito.mockito-core,
org.eclipse.equinox.preferences;bundle-version="3.5.200"
Bundle-ActivationPolicy: lazy
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index b0690cc..310e9d6 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -103,12 +103,13 @@
- plugin at org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
+generate.feature at org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
\ No newline at end of file
---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-03-24 12:58:43.355826288 +0000
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-03-24 13:04:46.463916138 +0000
-@@ -75,6 +75,12 @@
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
+@@ -74,6 +74,13 @@
+ <plugin id="org.eclipse.core.net.linux.x86_64"/>
<plugin id="org.eclipse.core.net.win32.x86"/>
<plugin id="org.eclipse.core.net.win32.x86_64"/>
- <plugin id="org.eclipse.equinox.security.macosx"/>
++ <plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
+ <plugin id="org.eclipse.compare.win32"/>
@@ -182,12 +183,12 @@
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
-@@ -54,6 +54,30 @@
+@@ -54,6 +54,29 @@
<plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
-+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
-+ <plugin id="org.apache.felix.gogo.command" />
++ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
++ <plugin id="org.apache.felix.gogo.command" />
+ <plugin id="org.apache.batik.css" />
+ <plugin id="org.w3c.css.sac" />
+ <plugin id="org.apache.batik.util" />
@@ -199,7 +200,6 @@
+ <plugin id="org.apache.felix.gogo.shell" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
-+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le" />
+ <plugin id="org.eclipse.swt.win32.win32.x86" />
+ <plugin id="org.eclipse.swt.win32.win32.x86_64" />
+ <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" />
@@ -209,7 +209,7 @@
+ <plugin id="org.eclipse.swt.gtk.aix.ppc" />
+ <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
+ <plugin id="org.eclipse.swt.gtk.hpux.ia64" />
-+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
++ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
</excludes>
</configuration>
</execution>
diff --git a/eclipse-no-target-platform.patch b/eclipse-no-target-platform.patch
index cb8db90..ae8873b 100644
--- a/eclipse-no-target-platform.patch
+++ b/eclipse-no-target-platform.patch
@@ -1,14 +1,14 @@
---- eclipse-platform-parent/pom.xml.orig 2014-03-24 15:52:04.794208197 +0000
-+++ eclipse-platform-parent/pom.xml 2014-03-24 15:56:15.746202079 +0000
-@@ -170,13 +170,6 @@
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
+--- eclipse-platform-parent/pom.xml.orig 2015-01-30 11:09:37.156904060 +0000
++++ eclipse-platform-parent/pom.xml 2015-01-30 11:11:05.154445821 +0000
+@@ -204,13 +204,6 @@
+ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=453757
+ <resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
+ -->
- <target>
- <artifact>
- <groupId>org.eclipse</groupId>
- <artifactId>eclipse-sdk-prereqs</artifactId>
-- <version>4.4.0-SNAPSHOT</version>
+- <version>4.5.0-SNAPSHOT</version>
- </artifact>
- </target>
<environments>
diff --git a/eclipse-policy-comparators.patch b/eclipse-policy-comparators.patch
index b15cd3b..5ba1091 100644
--- a/eclipse-policy-comparators.patch
+++ b/eclipse-policy-comparators.patch
@@ -11,7 +11,7 @@
}
--- eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java.orig 2014-03-27 11:27:35.233213660 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java 2014-03-27 12:19:30.696748271 +0000
-@@ -13,6 +13,7 @@
+@@ -14,6 +14,7 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.ArrayList;
@@ -19,7 +19,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
-@@ -235,7 +236,7 @@
+@@ -228,7 +229,7 @@
// show Help button in JFace dialogs
TrayDialog.setDialogHelpAvailable(true);
@@ -27,4 +27,4 @@
+ Policy.setComparator((Comparator)Collator.getInstance());
}
- /*
+ @Override
diff --git a/eclipse-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch
index 07bf0c2..2e6faa2 100644
--- a/eclipse-remove-jgit-provider.patch
+++ b/eclipse-remove-jgit-provider.patch
@@ -1,6 +1,6 @@
---- eclipse-platform-parent/pom.xml.orig 2014-05-26 17:04:22.000000000 +0300
-+++ eclipse-platform-parent/pom.xml 2014-05-26 18:57:29.044704226 +0300
-@@ -332,7 +332,7 @@
+--- eclipse-platform-parent/pom.xml.orig 2014-11-28 14:54:50.000000000 +0000
++++ eclipse-platform-parent/pom.xml 2014-11-28 15:32:51.700154985 +0000
+@@ -360,7 +360,7 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<dependencies>
@@ -9,7 +9,7 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
-@@ -341,19 +341,19 @@
+@@ -369,19 +369,19 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho-extras.version}</version>
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 34b52d9..f490ee7 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -1,8 +1,6 @@
-diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
-index 6c567f8..969eafb 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
-@@ -209,49 +209,19 @@
+@@ -243,44 +243,14 @@
<arch>s390x</arch>
</environment>
<environment>
@@ -18,11 +16,6 @@ index 6c567f8..969eafb 100644
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
-- <arch>x86</arch>
-- </environment>
-- <environment>
-- <os>macosx</os>
-- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
@@ -37,17 +30,15 @@ index 6c567f8..969eafb 100644
- </environment>
- <environment>
- <os>hpux</os>
-+ <os>linux</os>
- <ws>gtk</ws>
+- <ws>gtk</ws>
- <arch>ia64</arch>
-+ <arch>arm</arch>
- </environment>
- <environment>
+- </environment>
+- <environment>
- <os>aix</os>
+ <os>linux</os>
<ws>gtk</ws>
- <arch>ppc</arch>
-+ <arch>ppc64le</arch>
++ <arch>arm</arch>
</environment>
<environment>
- <os>aix</os>
@@ -86,24 +77,22 @@ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.proper
index 80a32e4..85de879 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-@@ -32,6 +32,12 @@ root.solaris.gtk.sparc.permissions.755=eclipse
- root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
- root.solaris.gtk.x86.permissions.755=eclipse
+@@ -58,6 +58,10 @@
+ root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
+ root.linux.gtk.s390.permissions.755=eclipse
-+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
++root.linux.gtk.arm=rootfiles/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
+root.linux.gtk.arm.permissions.755=eclipse
-+root.linux.gtk.aarch64=target/resources/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
-+root.linux.gtk.aarch64.permissions.755=eclipse
-+root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
-+root.linux.gtk.ppc64le.permissions.755=eclipse
- root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
- root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
- root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
++root.linux.gtk.aarch64=rootfiles/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
++root.linux.gtk.aarch64.permissions.755=eclipse
+
+ bin.includes = feature.properties
+
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml
+++ b/eclipse.platform.swt.binaries/pom.xml
-@@ -54,6 +54,8 @@
+@@ -53,6 +53,8 @@
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
@@ -116,7 +105,7 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
index b46cdc6..0fb36a5 100644
--- a/rt.equinox.framework/pom.xml
+++ b/rt.equinox.framework/pom.xml
-@@ -55,6 +55,8 @@
+@@ -54,6 +54,8 @@
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
@@ -125,18 +114,6 @@ index b46cdc6..0fb36a5 100644
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-index f5fb504..1187e84 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-@@ -425,6 +425,7 @@
- <equals arg1="${swt.arch}" arg2="ppc64"/>
- <equals arg1="${swt.arch}" arg2="ppc64le"/>
- <equals arg1="${swt.arch}" arg2="s390x"/>
-+ <equals arg1="${swt.arch}" arg2="aarch64"/>
- </or>
- </condition>
- <echo>Is64=${is64}</echo>
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
index 7e1f520..734dd10 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
@@ -218,10 +195,8 @@ index 29d3871..45526c8 100644
*)
echo "*** Unknown MODEL <${MODEL}>"
;;
-diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-index fac13bf..e487001 100644
---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
@@ -219,6 +219,189 @@
</plugins>
</build>
@@ -412,79 +387,23 @@ index fac13bf..e487001 100644
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
-@@ -530,8 +530,6 @@
- <include name="gtk/solaris/x86/**/*" />
- <include name="win32/win32/x86/**/*" />
- <include name="win32/win32/x86_64/**/*" />
+@@ -347,8 +530,6 @@
+ <include name="gtk/solaris/x86/**/*"/>
+ <include name="win32/win32/x86/**/*"/>
+ <include name="win32/win32/x86_64/**/*"/>
- </fileset>
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
- <include name="gtk/linux/s390/**/*" />
- <include name="gtk/linux/s390x/**/*" />
+ <include name="gtk/linux/s390/**/*"/>
+ <include name="gtk/linux/s390x/**/*"/>
</fileset>
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2014-05-26 19:20:28.958177815 +0300
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2014-05-26 19:33:42.942025740 +0300
-@@ -30,6 +30,64 @@
- <version>2.6</version>
- <executions>
- <execution>
-+ <id>copy-resources-gtk.linux.aarch64</id>
-+ <phase>validate</phase>
-+ <goals>
-+ <goal>copy-resources</goal>
-+ </goals>
-+ <configuration>
-+ <outputDirectory>${basedir}/target/resources/linux.gtk.aarch64</outputDirectory>
-+ <resources>
-+ <resource>
-+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.aarch64</directory>
-+ <includes>
-+ <include>about_files/*</include>
-+ <include>about.html</include>
-+ </includes>
-+ </resource>
-+ </resources>
-+ </configuration>
-+ </execution>
-+ <execution>
-+ <id>copy-resources-gtk.linux.arm</id>
-+ <phase>validate</phase>
-+ <goals>
-+ <goal>copy-resources</goal>
-+ </goals>
-+ <configuration>
-+ <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
-+ <resources>
-+ <resource>
-+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
-+ <includes>
-+ <include>about_files/*</include>
-+ <include>about.html</include>
-+ </includes>
-+ </resource>
-+ </resources>
-+ </configuration>
-+ </execution>
-+ <execution>
-+ <id>copy-resources-gtk.linux.ppc64le</id>
-+ <phase>validate</phase>
-+ <goals>
-+ <goal>copy-resources</goal>
-+ </goals>
-+ <configuration>
-+ <outputDirectory>${basedir}/rootfiles/linux.gtk.ppc64le</outputDirectory>
-+ <resources>
-+ <resource>
-+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64le
-+ </directory>
-+ <includes>
-+ <include>about_files/*</include>
-+ <include>about.html</include>
-+ </includes>
-+ </resource>
-+ </resources>
-+ </configuration>
-+ </execution>
-+ <execution>
- <id>copy-resources-gtk.linux.x86</id>
- <phase>validate</phase>
- <goals>
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
+@@ -59,4 +59,8 @@
+ root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
+ root.linux.gtk.s390.permissions.755=launcher
+
++root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
++root.linux.gtk.aarch64.permissions.755=launcher
++root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
++root.linux.gtk.arm.permissions.755=launcher
+
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 940c666..29d855d 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -1,6 +1,6 @@
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2014-04-01 15:02:34.500445944 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2014-04-01 15:16:01.556714647 +0100
-@@ -200,99 +200,14 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2014-11-28 14:54:50.000000000 +0000
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2014-11-28 15:44:49.542304044 +0000
+@@ -207,79 +207,8 @@
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
<target name="setupPlatform">
@@ -34,17 +34,19 @@
- </or>
- </and>
- </condition>
+- <!--
- <condition
- property="platformArchive"
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
- <and>
- <os family="mac" />
- <os family="unix" />
-- <!-- should not need, as long as x86_64 rules (above) comes first
+- <!- - should not need, as long as x86_64 rules (above) comes first
- <os arch="i386" />
-- -->
+- - ->
- </and>
- </condition>
+- -->
- <condition
- property="platformArchive"
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
@@ -74,38 +76,12 @@
- <os arch="amd64" />
- </or>
- </and>
-+ <property name="platformArchive" value="${runtimeArchive}" />
-+ <condition property="platformTarget" value="platform-zip">
-+ <contains string="${platformArchive}" substring=".zip" />
- </condition>
--
-- <fail
-- unless="platformArchive"
-- message="platformArchive is not defined. Check that conditions cover os arch ${os.arch}. May be VM dependent.)" />
--
-- <condition
-- property="platformTarget"
-- value="platform-zip">
-- <contains
-- string="${platformArchive}"
-- substring=".zip" />
- </condition>
-- <condition
-- property="platformTarget"
-- value="platform-tar.gz">
-- <contains
-- string="${platformArchive}"
-- substring=".tar.gz" />
-+ <condition property="platformTarget" value="platform-tar.gz">
-+ <contains string="${platformArchive}" substring=".tar.gz" />
- </condition>
-- <fail
-- unless="platformTarget"
-- message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
- <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
- <antcall target="${platformTarget}" />
- </target>
-@@ -320,7 +235,7 @@
++ <property name="platformArchive" value="${runtimeArchive}" />
+
+ <fail
+ unless="platformArchive"
+@@ -329,7 +258,7 @@
<exec
dir="${platformLocation}"
executable="tar">
@@ -114,7 +90,7 @@
</exec>
</target>
-@@ -867,6 +782,17 @@
+@@ -886,6 +815,17 @@
arg2="" />
</not>
</condition>
@@ -132,7 +108,7 @@
<antcall target="runSuite" />
<antcall target="genResults" />
</target>
-@@ -1411,6 +1337,15 @@
+@@ -1430,6 +1370,15 @@
value="end longRunningTests" />
</antcall>
@@ -148,7 +124,7 @@
</target>
<!--
-@@ -1453,7 +1388,6 @@
+@@ -1471,7 +1420,6 @@
<antcall target="e4CssSwt" />
<antcall target="e4UI" />
<antcall target="equinoxds" />
@@ -156,7 +132,7 @@
<antcall target="bidi" />
<antcall target="ltkuirefactoringtests" />
<antcall target="ltkcorerefactoringtests" />
-@@ -1467,7 +1401,6 @@
+@@ -1485,7 +1433,6 @@
<antcall target="osgi" />
<antcall target="coreresources" />
<antcall target="equinoxp2" />
@@ -164,7 +140,7 @@
<antcall target="jface" />
<antcall target="ui" />
<antcall target="uiperformance" />
-@@ -1550,7 +1483,7 @@
+@@ -1568,7 +1515,7 @@
<property
name="message"
value="no message given by caller" />
diff --git a/eclipse-webkit2-support.patch b/eclipse-webkit2-support.patch
index c4273c6..1d9fa67 100644
--- a/eclipse-webkit2-support.patch
+++ b/eclipse-webkit2-support.patch
@@ -1,24 +1,3 @@
-diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
-index 01b3f12..2009b84 100644
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
-@@ -401,6 +401,7 @@ public Object evaluate (String script) throws SWTException {
- registerFunction (function);
- String functionName = EXECUTE_ID + index;
-
-+ // Create a function that will execute the given script
- StringBuffer buffer = new StringBuffer ("window."); // $NON-NLS-1$
- buffer.append (functionName);
- buffer.append (" = function "); // $NON-NLS-1$
-@@ -410,6 +411,8 @@ public Object evaluate (String script) throws SWTException {
- buffer.append ("\n};"); // $NON-NLS-1$
- execute (buffer.toString ());
-
-+ // Execute the function created above, assign the result to
-+ // a variable then call Java with that result
- buffer = new StringBuffer ("if (window."); // $NON-NLS-1$
- buffer.append (functionName);
- buffer.append (" == undefined) {window.external.callJava("); // $NON-NLS-1$
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
index 780a82c..c3bedd0 100644
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
@@ -716,20 +695,6 @@ index 15b7761..3994f37 100644
#ifndef NO__1webkit_1web_1view_1get_1progress
JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress)
(JNIEnv *env, jclass that, jintLong arg0)
-diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
-index f54feb4..0598b9f 100644
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
-@@ -31,6 +31,9 @@
- char *webkit2 = getenv("SWT_WEBKIT2"); \
- if (webkit2 != NULL && strcmp(webkit2, "1") == 0) { \
- handle = dlopen("libwebkit2gtk-3.0.so.25", LOAD_FLAGS); /* webkit2 */ \
-+ if (!handle) { \
-+ handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \
-+ } \
- } else { \
- handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk >= 3.x lib */ \
- } \
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
index c3cf9ee..b0e6650 100644
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
@@ -1554,15 +1519,6 @@ index 4b8c089..176b44f 100644
public static char [] mbcsToWcs (String codePage, byte [] buffer) {
long /*int*/ [] items_written = new long /*int*/ [1];
long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
-@@ -57,7 +64,7 @@ public static byte [] wcsToMbcs (String codePage, String string, boolean termina
- public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {
- long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1];
- /*
-- * Note that g_utf16_to_utf8() stops converting
-+ * Note that g_utf16_to_utf8() stops converting
- * when it finds the first NULL.
- */
- long /*int*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GVariantConverter.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GVariantConverter.java
new file mode 100644
index 0000000..dc19b0f
diff --git a/eclipse.spec b/eclipse.spec
index 2acf7a1..f792257 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -10,12 +10,12 @@
Epoch: 1
%global eclipse_major 4
-%global eclipse_minor 4
-%global eclipse_micro 1
-%global eb_commit 2135919f7f0f11f3c43901b8e70819c9a4911ac3
-%global eclipse_tag R4_4_1
+%global eclipse_minor 5
+%global eclipse_micro 0
+%global eb_commit 2775b93d3d9f147f5711c91bb3aa623f2582019d
+%global eclipse_tag I20150210-0800
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
-%global _jetty_version 9.2.3
+%global _jetty_version 9.2.7
%ifarch %{ix86}
%define eclipse_arch x86
@@ -38,9 +38,8 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 17%{?dist}
+Release: 0.1.git201502100800%{?dist}
License: EPL
-Group: Development/Tools
URL: http://www.eclipse.org/
# Tarball generated by calling ./get-eclipse.sh
@@ -92,18 +91,15 @@ Patch11: %{pkg_name}-debug-symbols.patch
Patch12: %{pkg_name}-fix-comaptibility-class.patch
-Patch13: %{pkg_name}-bug-903537.patch
-
-Patch14: %{pkg_name}-jetty-9.patch
-
Patch15: %{pkg_name}-fix-startup-class-refresh.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138
Patch16: %{pkg_name}-fix-dropins.patch
Patch17: %{pkg_name}-bug-386377.patch
-Patch18: %{pkg_name}-servlet-3.1.patch
Patch19: %{pkg_name}-lucene-4.patch
+
+# Resolving the target platform requires too many changes, so don't use it
Patch20: %{pkg_name}-no-target-platform.patch
# org.mockito -> org.mockito.mockito-core
@@ -112,7 +108,6 @@ Patch21: %{pkg_name}-mockito.patch
Patch22: %{pkg_name}-policy-comparators.patch
Patch23: %{pkg_name}-webkit2-support.patch
-Patch24: %{pkg_name}-bug-444143.patch
Patch25: %{pkg_name}-support-symlink-bundles.patch
@@ -122,9 +117,6 @@ Patch25: %{pkg_name}-support-symlink-bundles.patch
# the plugin in the top-level category so it still gets bundled.
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
-
# Require hamcrest when using directly (cannot rely on junit reexporting it)
Patch28: eclipse-direct-hamcrest-use.patch
@@ -144,7 +136,6 @@ BuildRequires: desktop-file-utils
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: libXt-devel
BuildRequires: webkitgtk-devel
-BuildRequires: webkitgtk4
BuildRequires: webkitgtk4-devel
BuildRequires: geronimo-annotation >= 1.0-7
BuildRequires: %{?scl_prefix}icu4j >= 1:54.1.1-2
@@ -198,13 +189,12 @@ everything in between.
%package swt
Summary: SWT Library for GTK+
-Group: Development/Tools
Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: gtk2
Requires: gtk3
Requires: webkitgtk
-Requires: webkitgtk3
+Requires: webkitgtk4
%description swt
SWT Library for GTK+.
@@ -220,7 +210,6 @@ Eclipse OSGi - Equinox
%package platform
Summary: Eclipse platform common files
-Group: Development/Tools
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
Requires: apache-commons-el >= 1.0-23
@@ -264,7 +253,6 @@ Java Development Tools or the Plugin Development Environment.
%package jdt
Summary: Eclipse Java Development Tools
-Group: Development/Tools
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: junit >= 4.10-5
Requires: hamcrest >= 0:1.1-11
@@ -275,7 +263,6 @@ developing software written in the Java programming language.
%package pde
Summary: Eclipse Plugin Development Environment
-Group: Development/Tools
Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
@@ -290,7 +277,6 @@ developing Eclipse plugins.
%package p2-discovery
Summary: Eclipse p2 Discovery
-Group: Development/Tools
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Obsoletes: %{name}-p2-discovery < 1:4.4.0
@@ -302,7 +288,6 @@ installer UIs.
%package tests
Summary: Eclipse Tests
-Group: Development/Tools
Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
Requires: easymock3
Requires: mockito
@@ -328,24 +313,19 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch10 -p1
%patch11
%patch12
-%patch13
-%patch14
%patch15
%patch16
%patch17
-%patch18
%patch19 -p1
%patch20
%patch21
%patch22
%patch23
-%patch24 -p1
%patch25
%patch26
-%patch27 -p1
%patch28
-#Disable as many things as possible to make the build faster. We care only for Eclipse.
+# 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
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -354,15 +334,15 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
-%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
-%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.caching rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles
@@ -372,7 +352,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
-%pom_disable_module org.eclipse.ua.tests eclipse.platform.ua
# We don't need releng tools
%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng
@@ -415,7 +394,6 @@ done
%pom_disable_module bundles/org.eclipse.core.filesystem.win32.x86_64 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64 eclipse.platform.resources
-%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
%pom_disable_module examples/org.eclipse.swt.examples.ole.win32 eclipse.platform.swt
@@ -427,6 +405,11 @@ for dir in eclipse.platform.swt.binaries/bundles \
utils/ensure_arch.sh "$dir" x86_64 aarch64
done
+# Include some extra features with the product that some other projects may need at
+# build time as part of their target platform definitions
+sed -i -e '170i<feature id="org.eclipse.core.runtime.feature"/>' \
+ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
+
# Don't mirror stuff to the repo that we haven't built
%pom_xpath_remove "pom:execution[pom:id[text()='mirror-build-emf']]" \
eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository
@@ -456,9 +439,12 @@ for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt
done
# Don't set perms on files for platforms that aren't linux
-sed -i -e '/^root\.[^l]/d' \
- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \
- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+for f in \
+ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \
+ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties ; do
+ grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
+ sed -i -e '/^root\./d' $f && cat tmp >> $f
+done
# Hack - this can go away once upstream grows arm and aarch64 support
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
@@ -496,10 +482,6 @@ sed -i 's/javax\.el/com\.sun\.el\.javax\.el/' \
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
-# Bump javax.servlet Import-Package statements
-sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
-sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
-
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
sed -i -e 's at Dhelp.lucene.tokenizer=standard at XX:MaxPermSize=384M at g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -514,17 +496,15 @@ sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
export JAVA_HOME=%{java_home}
-
export GTK_VERSION=3.0
-xmvn -o clean verify \
+
+%mvn_build -j -f -- \
%if %{bootstrap}
-P !api-generation,!build-docs \
%endif
- -Declipse.javadoc=/usr/bin/javadoc \
- -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
+ -Declipse.javadoc=/usr/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \
-Dtycho.local.keepTarget -Ddirector.running.env.only=true \
- -Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins \
- -Dtargets=install -DbuildType=Z
+ -Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins -DbuildType=Z
#ant again
dependencies/fake_ant_dependency.sh \
@@ -800,9 +780,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi
%files swt
-%{_libdir}/%{pkg_name}/notice.html
%{_libdir}/%{pkg_name}/eclipse.ini
-%{_libdir}/%{pkg_name}/epl-v10.html
%{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.*
%{_libdir}/%{pkg_name}/swt.jar
@@ -822,8 +800,10 @@ fi
%dir %{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/
%{_libdir}/%{pkg_name}/configuration/config.ini
%{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.core.runtime.feature_*
%{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.core.feature_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
%{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
@@ -893,6 +873,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.ide.application_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.intro_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.intro.universal_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.monitoring_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator.resources_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.net_*
@@ -909,6 +890,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.swt_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.di_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.dialogs_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.model.workbench_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.services_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.widgets_*
@@ -995,8 +977,6 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.update.configurator_*
%{_libdir}/%{pkg_name}/readme
-%{_libdir}/%{pkg_name}/about_files
-%doc %{_libdir}/%{pkg_name}/about.html
%{_libdir}/%{pkg_name}/artifacts.xml
%{_libdir}/%{pkg_name}/p2
%{_javadir}/%{pkg_name}/core*
@@ -1030,6 +1010,15 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
+* Fri Jan 30 2015 Mat Booth <mat.booth at redhat.com> - 1:4.5.0-0.1.git201502100800
+- Update to latest 4.5.0 I-build
+- Drop upstreamed jetty9/servlet and workspace picker patches
+- Drop upstreamed patches for bug 903537 and bug 444143
+- Update eclipse-build snapshot for ant dependency
+- Ship missing features used by some other projects' target platform
+- Build with mvn_build macro
+- Some spec file clean-up
+
* Fri Jan 23 2015 Michael Simacek <msimacek at redhat.com> - 1:4.4.1-17
- Rebuild against new jetty
diff --git a/get-eclipse.sh b/get-eclipse.sh
index cb74cc0..784320e 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=R4_4_1
+TAG=I20150210-0800
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
@@ -28,7 +28,8 @@ find . -type f -name *.class -delete
find . -type f -name *.so -delete
find . -type f -name *.dll -delete
find . -type f -name *.jnilib -delete
-find . -type f -name eclipse -delete
+# Remove pre-compiled native launchers
+rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
popd
diff --git a/sources b/sources
index d96c09f..a859ede 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0d857f3b64931672dca62142d7fbdbd0 R4_platform-aggregator-R4_4_1.tar.xz
-4c99218a93f07f77d356c9bf06ee1cce org.eclipse.linuxtools.eclipse-build-2135919f7f0f11f3c43901b8e70819c9a4911ac3.tar.bz2
+078ea3a8611e0aebcb1a5b5c037e101c R4_platform-aggregator-I20150210-0800.tar.xz
+1497147a427b98a00a87263880063294 org.eclipse.linuxtools.eclipse-build-2775b93d3d9f147f5711c91bb3aa623f2582019d.tar.bz2
More information about the scm-commits
mailing list