[eclipse] Update to 4.3.1
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Sep 30 11:29:04 UTC 2013
commit b526d5c6f1d340b598fa43130d0e01917a955aa7
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Sep 3 09:41:09 2013 +0200
Update to 4.3.1
eclipse-bug-386377.patch | 260 ++++++++++++++++++++++++++++++
eclipse-change-build-packagings.patch | 4 +-
eclipse-fix-dropins.patch | 77 +--------
eclipse-no-source-for-dependencies.patch | 5 +-
eclipse.spec | 15 +-
get-eclipse.sh | 2 +-
sources | 4 +-
7 files changed, 280 insertions(+), 87 deletions(-)
---
diff --git a/eclipse-bug-386377.patch b/eclipse-bug-386377.patch
index 121b781..ac92081 100644
--- a/eclipse-bug-386377.patch
+++ b/eclipse-bug-386377.patch
@@ -335,6 +335,266 @@ index ce4252c..4b72b1f 100644
+ </profile>
+ </profiles>
</project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+@@ -27,4 +27,60 @@
+ <ws>gtk</ws>
+ <arch>s390</arch>
+ </properties>
++
++ <profiles>
++ <profile>
++ <id>build-native-launchers-gtk.linux.s390</id>
++ <activation>
++ <property>
++ <name>native</name>
++ <value>gtk.linux.s390</value>
++ </property>
++ </activation>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-antrun-plugin</artifactId>
++ <version> 1.7 </version>
++ <executions>
++ <execution>
++ <id>compile-executable-natives</id>
++ <phase>generate-resources</phase>
++ <configuration>
++ <target>
++ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++ </target>
++ </configuration>
++ <goals>
++ <goal>run</goal>
++ </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>
++ </profile>
++ </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+@@ -27,4 +27,60 @@
+ <ws>gtk</ws>
+ <arch>s390x</arch>
+ </properties>
++
++ <profiles>
++ <profile>
++ <id>build-native-launchers-gtk.linux.s390x</id>
++ <activation>
++ <property>
++ <name>native</name>
++ <value>gtk.linux.s390x</value>
++ </property>
++ </activation>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-antrun-plugin</artifactId>
++ <version> 1.7 </version>
++ <executions>
++ <execution>
++ <id>compile-executable-natives</id>
++ <phase>generate-resources</phase>
++ <configuration>
++ <target>
++ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++ </target>
++ </configuration>
++ <goals>
++ <goal>run</goal>
++ </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>
++ </profile>
++ </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+@@ -29,4 +29,60 @@
+ <ws>gtk</ws>
+ <arch>ppc</arch>
+ </properties>
++
++ <profiles>
++ <profile>
++ <id>build-native-launchers-gtk.linux.ppc</id>
++ <activation>
++ <property>
++ <name>native</name>
++ <value>gtk.linux.ppc</value>
++ </property>
++ </activation>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-antrun-plugin</artifactId>
++ <version> 1.7 </version>
++ <executions>
++ <execution>
++ <id>compile-executable-natives</id>
++ <phase>generate-resources</phase>
++ <configuration>
++ <target>
++ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++ </target>
++ </configuration>
++ <goals>
++ <goal>run</goal>
++ </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>
++ </profile>
++ </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+@@ -28,4 +28,60 @@
+ <ws>gtk</ws>
+ <arch>ppc64</arch>
+ </properties>
++
++ <profiles>
++ <profile>
++ <id>build-native-launchers-gtk.linux.ppc64</id>
++ <activation>
++ <property>
++ <name>native</name>
++ <value>gtk.linux.ppc64</value>
++ </property>
++ </activation>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-antrun-plugin</artifactId>
++ <version> 1.7 </version>
++ <executions>
++ <execution>
++ <id>compile-executable-natives</id>
++ <phase>generate-resources</phase>
++ <configuration>
++ <target>
++ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++ </target>
++ </configuration>
++ <goals>
++ <goal>run</goal>
++ </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>
++ </profile>
++ </profiles>
+ </project>
--
1.8.3.1
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 938d61c..60177b1 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -15,8 +15,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
--<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
-+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.1.qualifier" useFeatures="true" includeLaunchers="true">
++<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.1.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch
index 297e3b0..4d5df65 100644
--- a/eclipse-fix-dropins.patch
+++ b/eclipse-fix-dropins.patch
@@ -82,81 +82,14 @@
}
return engine.perform(plan, phaseSet, monitor);
}
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java.bak 2013-06-10 09:33:20.000000000 +0200
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java 2013-06-11 15:44:28.654682088 +0200
-@@ -144,7 +144,7 @@
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-10 09:33:20.000000000 +0200
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-11 15:44:28.654682088 +0200
+@@ -151,7 +151,7 @@
}
public boolean performCancel() {
-- String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.ImportFromInstallationPag_LATER_BUTTON, IDialogConstants.NO_LABEL};
+- String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, IDialogConstants.NO_LABEL};
+ String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL};
- MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.ImportFromInstallationPage_CONFIRMATION_TITLE, null, ProvUIMessages.ImportFromInstallationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2);
+ MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2);
return rememberCancellationDecision(dialog.open());
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java
-@@ -15,6 +15,7 @@ package org.eclipse.equinox.internal.p2.ui.sdk.scheduler.migration;
- import java.net.URI;
- import org.eclipse.core.runtime.Platform;
- import org.eclipse.equinox.internal.p2.ui.ProvUI;
-+import org.eclipse.equinox.internal.p2.ui.QueryProvider;
- import org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage;
- import org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard;
- import org.eclipse.equinox.internal.p2.ui.model.ProfileElement;
-@@ -103,6 +104,12 @@ public class ImportFromInstallationPage_c extends AbstractImportPage_c implement
- public org.eclipse.equinox.p2.query.IQueryable<?> getQueryable() {
- return toBeImportedProfile;
- }
-+
-+ @Override
-+ public int getQueryType() {
-+ return QueryProvider.STRICT_INSTALLED_IUS;
-+ }
-+
- };
- element.setQueryable(toBeImportedProfile);
- input = element;
-diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java
-index 9cb6a53..b758ae7 100644
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java
-@@ -43,6 +43,7 @@ public class QueryProvider {
- public static final int AVAILABLE_UPDATES = 5;
- public static final int INSTALLED_IUS = 6;
- public static final int AVAILABLE_ARTIFACTS = 7;
-+ public static final int STRICT_INSTALLED_IUS = 8;
-
- public QueryProvider(ProvisioningUI ui) {
- this.ui = ui;
-@@ -224,6 +225,31 @@ public class QueryProvider {
- return null;
- return new ElementQueryDescriptor(queryable, ArtifactKeyQuery.ALL_KEYS, new Collector<Object>(), new ArtifactKeyWrapper((IArtifactRepository) queryable, element));
-
-+ case STRICT_INSTALLED_IUS :
-+ // Querying of IU's. We are drilling down into the requirements.
-+ if (element instanceof IIUElement && context.getShowInstallChildren()) {
-+ Collection<IRequirement> reqs = ((IIUElement) element).getRequirements();
-+ IExpression[] requirementExpressions = new IExpression[reqs.size()];
-+ int i = 0;
-+ for (IRequirement req : reqs) {
-+ requirementExpressions[i++] = req.getMatches();
-+ }
-+ IExpressionFactory factory = ExpressionUtil.getFactory();
-+ IQuery<IInstallableUnit> meetsAnyRequirementQuery = QueryUtil.createMatchQuery(factory.or(requirementExpressions));
-+ IQuery<IInstallableUnit> visibleAsAvailableQuery = policy.getVisibleAvailableIUQuery();
-+ //dropins things have no file property
-+ IQuery<IInstallableUnit> strictQuery = QueryUtil.createIUPropertyQuery("file.name", null); //$NON-NLS-1$
-+ IQuery<IInstallableUnit> createCompoundQuery = QueryUtil.createCompoundQuery(QueryUtil.createCompoundQuery(visibleAsAvailableQuery, meetsAnyRequirementQuery, true), strictQuery, true);
-+ return new ElementQueryDescriptor(queryable, createCompoundQuery, new Collector<IInstallableUnit>(), new InstalledIUElementWrapper(queryable, element));
-+ }
-+
-+ profile = ProvUI.getAdapter(element, IProfile.class);
-+ if (profile == null)
-+ return null;
-+ //dropins things have no file property
-+ IQuery<IInstallableUnit> installedNotDropinsQuery = QueryUtil.createCompoundQuery(policy.getVisibleInstalledIUQuery(), QueryUtil.createIUPropertyQuery("file.name", null), true);
-+ return new ElementQueryDescriptor(profile, installedNotDropinsQuery, new Collector<IInstallableUnit>(), new InstalledIUElementWrapper(profile, element)); //$NON-NLS-1$
-+
- default :
- return null;
- }
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index d5582f8..6851608 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -99,13 +99,14 @@
\ No newline at end of file
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2013-03-14 11:35:02.000000000 +0100
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2013-03-14 12:53:51.015502076 +0100
-@@ -72,6 +72,13 @@
+@@ -72,6 +72,14 @@
<plugin id="org.w3c.css.sac"/>
<plugin id="org.w3c.dom.smil"/>
<plugin id="org.w3c.dom.svg"/>
+
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
-+ <plugin id=" org.apache.felix.gogo.command" />
++ <plugin id="org.apache.felix.gogo.command" />
++ <plugin id="javax.inject" />
+ <plugin id="com.ibm.icu"/>
+ <plugin id="org.apache.felix.gogo.runtime" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
diff --git a/eclipse.spec b/eclipse.spec
index 2030b7f..38c7933 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -7,10 +7,10 @@ Epoch: 1
%global eclipse_major 4
%global eclipse_minor 3
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro 0
+%global eclipse_micro 1
%global initialize 1
%global eb_commit 60a5a559fd746d946d869720c889bc698d9e6ab3
-%global eclipse_tag R4_3
+%global eclipse_tag R4_3_1
%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: 13%{?dist}
+Release: 1%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -123,8 +123,6 @@ Patch26: %{pkg_name}-fix-dropins.patch
Patch27: %{pkg_name}-bug-408505.patch
-Patch28: %{pkg_name}-bug-404448.patch
-
Patch29: %{pkg_name}-bug-386377.patch
BuildRequires: ant >= 1.8.3
@@ -349,7 +347,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch25
%patch26
%patch27
-%patch28
pushd rt.equinox.framework
%patch29 -p1
popd
@@ -396,8 +393,6 @@ popd
%pom_disable_module bundles/org.eclipse.swt.gtk.solaris.x86 eclipse.platform.swt.binaries
%pom_disable_module bundles/org.eclipse.swt.gtk.hpux.ia64 eclipse.platform.swt.binaries
-%pom_disable_module bundles/org.sat4j.core rt.equinox.p2
-%pom_disable_module bundles/org.sat4j.pb rt.equinox.p2
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
@@ -489,6 +484,7 @@ pushd eclipse.platform.swt.binaries/bundles/
done
popd
+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
%build
%{?scl:%scl_maven_opts}
#This is the lowest value where the build succeeds. 512m is not enough.
@@ -1008,6 +1004,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Mon Sep 30 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.1-1
+- Update to 4.3.1.
+
* Thu Aug 29 2013 Alexander Kurtakov <akurtako at redhat.com> 1:4.3.0-13
- Let tests depend on easymock3.
diff --git a/get-eclipse.sh b/get-eclipse.sh
index d09a066..837e188 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_3
+TAG=R4_3_1
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index a679114..612e195 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5a0ba9bdecbfa0c88d9950455e0448bd R4_platform-aggregator-R4_3.tar.xz
-23f433f7a884c8029fe903cd1e70a8d7 eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
\ No newline at end of file
+0408d6c5f1808b963f4981fda8123b3a R4_platform-aggregator-R4_3_1.tar.xz
+23f433f7a884c8029fe903cd1e70a8d7 eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
More information about the scm-commits
mailing list