diff --git a/eclipse-popupdialog-color.patch b/eclipse-popupdialog-color.patch deleted file mode 100644 index 4a465cc..0000000 --- a/eclipse-popupdialog-color.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5b22d2a0716917f918f11e387fef1147a3bf202f Mon Sep 17 00:00:00 2001 -From: Roland Grunberg -Date: Tue, 12 Jul 2016 21:42:01 -0400 -Subject: [PATCH] Change PopupDialog from SWT.COLOR_INFO* to SWT.COLOR_LIST*. - ---- - src/org/eclipse/jface/dialogs/PopupDialog.java | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java -index e5162c2..b6f7917 100644 ---- eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java -+++ eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java -@@ -873,8 +873,8 @@ public class PopupDialog extends Window { - SWT.BEGINNING).applyTo(infoLabel); - Display display = parent.getDisplay(); - infoColor = new Color(display, blend( -- display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB(), -- display.getSystemColor(SWT.COLOR_INFO_FOREGROUND).getRGB(), -+ display.getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB(), -+ display.getSystemColor(SWT.COLOR_LIST_FOREGROUND).getRGB(), - 0.56f)); - infoLabel.setForeground(infoColor); - return infoLabel; -@@ -1406,7 +1406,7 @@ public class PopupDialog extends Window { - */ - private Color getDefaultForeground() { - return getShell().getDisplay() -- .getSystemColor(SWT.COLOR_INFO_FOREGROUND); -+ .getSystemColor(SWT.COLOR_LIST_FOREGROUND); - } - - /** -@@ -1416,7 +1416,7 @@ public class PopupDialog extends Window { - */ - private Color getDefaultBackground() { - return getShell().getDisplay() -- .getSystemColor(SWT.COLOR_INFO_BACKGROUND); -+ .getSystemColor(SWT.COLOR_LIST_BACKGROUND); - } - - /** --- -2.7.4 - diff --git a/eclipse.spec b/eclipse.spec index 840777b..516dd16 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,12 +1,12 @@ # Set to 1 to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%global bootstrap 0 +%global bootstrap 1 Epoch: 1 %global eb_commit d5db901519674ad1dd5823a62bb6cec7a0f73fa3 -%global eclipse_tag S4_6_1_RC4 +%global eclipse_tag R4_6_2 %if 0%{?fedora} >= 25 %global _jetty_version 9.4.0 @@ -42,8 +42,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.6.1 -Release: 7%{?dist} +Version: 4.6.2 +Release: 1%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -118,13 +118,16 @@ Patch23: eclipse-webkit2-by-default.patch # Port to jetty 9.4 Patch24: eclipse-jetty-9.4.patch -Patch25: eclipse-popupdialog-color.patch Patch26: eclipse-make-droplets-runnable.patch Patch27: eclipse-disable-droplets-in-dropins.patch # Temporary measure until wayland improves Patch28: prefer_x11_backend.patch +# Hack: Need to set system classpaths by reflection due to API change in ant +# A real solution should eventually come from https://bugs.eclipse.org/bugs/show_bug.cgi?id=499717 +Patch29: port_to_ant_1.10.patch + BuildRequires: tycho >= 0.25.0 BuildRequires: tycho-extras >= 0.25.0 BuildRequires: cbi-plugins @@ -160,7 +163,7 @@ BuildRequires: jsch >= 0:0.1.46-2 BuildRequires: apache-commons-el >= 1.0-22 BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec -BuildRequires: apache-commons-jxpath >= 1.3-23 +BuildRequires: apache-commons-jxpath BuildRequires: apache-commons-fileupload BuildRequires: felix-gogo-command BuildRequires: felix-gogo-shell @@ -175,8 +178,8 @@ BuildRequires: lucene-core >= %{_lucene_version} BuildRequires: lucene-analysis >= %{_lucene_version} BuildRequires: lucene-queryparser >= %{_lucene_version} BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version} -BuildRequires: junit >= 4.10-5 -BuildRequires: hamcrest >= 0:1.3-11 +BuildRequires: junit >= 4.12 +BuildRequires: hamcrest >= 1.3 BuildRequires: sat4j >= 2.3.5-1 BuildRequires: objectweb-asm >= 5.0.3-1 BuildRequires: sac >= 1.3-12 @@ -185,7 +188,7 @@ BuildRequires: xml-commons-apis >= 1.4.01-12 BuildRequires: atinject BuildRequires: atinject-tck BuildRequires: eclipse-filesystem -BuildRequires: eclipse-ecf-core >= 3.13.2-1 +BuildRequires: eclipse-ecf-core >= 3.13.3-1 BuildRequires: eclipse-emf-core >= 1:2.12.0-1 BuildRequires: eclipse-license BuildRequires: glassfish-el-api @@ -242,13 +245,14 @@ Eclipse OSGi - Equinox %package platform Summary: Eclipse platform common files Recommends: eclipse-abrt +Recommends: eclipse-usage 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 Requires: apache-commons-logging Requires: apache-commons-codec -Requires: apache-commons-jxpath >= 1.3-23 +Requires: apache-commons-jxpath Requires: felix-gogo-command Requires: felix-gogo-shell Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} @@ -269,7 +273,7 @@ Requires: sac >= 1.3-12 Requires: batik-css Requires: xml-commons-apis >= 1.4.01-12 Requires: atinject -Requires: eclipse-ecf-core >= 3.13.2-1 +Requires: eclipse-ecf-core >= 3.13.3-1 Requires: eclipse-emf-core >= 1:2.12.0-1 Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp >= 2.2.5 @@ -293,8 +297,8 @@ BuildArch: noarch Provides: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: junit >= 4.10-5 -Requires: hamcrest-core >= 0:1.3-11 +Requires: osgi(org.junit) >= 4.12 +Requires: osgi(org.hamcrest.core) >= 1.3 %description jdt Eclipse Java Development Tools. This package is required to use Eclipse for @@ -377,10 +381,10 @@ tar --strip-components=1 -xf %{SOURCE1} %if 0%{?fedora} >= 25 %patch24 %endif -%patch25 %patch26 %patch27 %patch28 +%patch29 # Use ecj when bootstrapping %if %{bootstrap} @@ -884,6 +888,10 @@ popd #fix so permissions find $RPM_BUILD_ROOT/%{_libdir}/eclipse -name *.so -exec chmod a+x {} \; +# Usage marker +install -d -m 755 %{buildroot}%{_libdir}/eclipse/.pkgs +echo "%{version}-%{release}" > %{buildroot}%{_libdir}/eclipse/.pkgs/Distro-%{?dist} + %post platform touch --no-create /usr/share/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -1114,6 +1122,13 @@ fi %{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Fri Jan 06 2017 Mat Booth - 1:4.6.2-1 +- Update to Neon.2 +- Bootstrap build due to ant update +- Port to new ant version +- Rebuild for ECF update +- Pull in usage plugin by default + * Mon Dec 05 2016 Mat Booth - 1:4.6.1-7 - Rebuild for new xz-java diff --git a/get-eclipse.sh b/get-eclipse.sh index 75bfa08..8fd4bf1 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=S4_6_1_RC4 +TAG=R4_6_2 rm -rf R4_platform-aggregator-$TAG rm -rf R4_platform-aggregator-$TAG.tar.xz diff --git a/port_to_ant_1.10.patch b/port_to_ant_1.10.patch new file mode 100644 index 0000000..f2041e0 --- /dev/null +++ b/port_to_ant_1.10.patch @@ -0,0 +1,207 @@ +--- eclipse.platform/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java.orig 2017-01-04 10:48:22.000000000 +0000 ++++ eclipse.platform/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java 2017-01-09 11:57:43.930455256 +0000 +@@ -19,6 +19,8 @@ + import java.io.IOException; + import java.io.InputStream; + import java.io.PrintStream; ++import java.lang.reflect.Field; ++import java.lang.reflect.Modifier; + import java.net.URL; + import java.text.MessageFormat; + import java.util.ArrayList; +@@ -1481,7 +1483,16 @@ + } + + org.apache.tools.ant.types.Path systemClasspath = new org.apache.tools.ant.types.Path(null, buff.substring(0, buff.length() - 2)); +- org.apache.tools.ant.types.Path.systemClasspath = systemClasspath; ++ try { ++ Field field = org.apache.tools.ant.types.Path.class.getDeclaredField("systemClasspath"); //$NON-NLS-1$ ++ Field modifiersField = Field.class.getDeclaredField("modifiers"); //$NON-NLS-1$ ++ modifiersField.setAccessible(true); ++ modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); ++ field.set(field, systemClasspath); ++ } ++ catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException | SecurityException e) { ++ e.printStackTrace(); ++ } + } + + /** +--- "eclipse.platform/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntDefiningTaskNode.java.orig" 2017-01-09 10:40:37.663084636 +0000 ++++ "eclipse.platform/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntDefiningTaskNode.java" 2017-01-09 10:41:11.452722811 +0000 +@@ -14,6 +14,8 @@ + + import java.io.File; + import java.io.IOException; ++import java.lang.reflect.Field; ++import java.lang.reflect.Modifier; + import java.net.URISyntaxException; + import java.net.URL; + import java.util.ArrayList; +@@ -175,7 +177,16 @@ + } + + org.apache.tools.ant.types.Path systemClasspath = new org.apache.tools.ant.types.Path(null, buff.substring(0, buff.length() - 2)); +- org.apache.tools.ant.types.Path.systemClasspath = systemClasspath; ++ try { ++ Field field = org.apache.tools.ant.types.Path.class.getDeclaredField("systemClasspath"); //$NON-NLS-1$ ++ Field modifiersField = Field.class.getDeclaredField("modifiers"); //$NON-NLS-1$ ++ modifiersField.setAccessible(true); ++ modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); ++ field.set(field, systemClasspath); ++ } ++ catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException | SecurityException e) { ++ e.printStackTrace(); ++ } + } + + @Override +--- eclipse.platform/ant/org.eclipse.ant.launching/build.properties.orig 2017-01-09 10:24:16.258243377 +0000 ++++ eclipse.platform/ant/org.eclipse.ant.launching/build.properties 2017-01-09 10:25:08.302620557 +0000 +@@ -20,18 +20,14 @@ + about.html + + jars.compile.order = .,\ +- lib/loggers.jar +-# antdebug.jar and remote.jar are compiled locally using 1.6, see bug 495617: +-# lib/antdebug.jar,\ +-# lib/remote.jar ++ lib/antdebug.jar,\ ++ lib/loggers.jar,\ ++ lib/remote.jar + source.lib/loggers.jar = loggers/ + output.lib/loggers.jar = loggers_bin/ +-extra.lib/loggers.jar = lib/antdebug.jar +-#source.lib/antdebug.jar = common/ +-#output.lib/antdebug.jar = common_bin/ +-#source.lib/remote.jar = remote/ +-#output.lib/remote.jar = remote_bin/ +-src.includes = about.html,\ +- remote/,\ +- common/ ++source.lib/antdebug.jar = common/ ++output.lib/antdebug.jar = common_bin/ ++source.lib/remote.jar = remote/ ++output.lib/remote.jar = remote_bin/ ++src.includes = about.html + javacWarnings..=-unavoidableGenericProblems +--- eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/AntUtils.java.orig 2017-01-09 10:47:27.168692489 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ant/AntUtils.java 2017-01-09 10:47:36.735589854 +0000 +@@ -115,6 +115,5 @@ + } + + org.apache.tools.ant.types.Path systemClasspath = new org.apache.tools.ant.types.Path(null, buff.substring(0, buff.length() - 2)); +- org.apache.tools.ant.types.Path.systemClasspath = systemClasspath; + } + } +--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml.orig 2017-01-09 13:30:24.238066571 +0000 ++++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml 2017-01-09 13:31:19.228456113 +0000 +@@ -1,106 +1,8 @@ + +- ++ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + diff --git a/sources b/sources index 318a978..7a7d069 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b302f16c7fd7301a05960745c17eed89 R4_platform-aggregator-S4_6_1_RC4.tar.xz -c5160620b3d6d8f453870ac85ba05c11 org.eclipse.linuxtools.eclipse-build-d5db901519674ad1dd5823a62bb6cec7a0f73fa3.tar.xz +SHA512 (R4_platform-aggregator-R4_6_2.tar.xz) = dcbcf4dfc9b0c913470f8006f85dcde83692c42e86fda53a026619a5a1dee8b0859a29cd740e0bbd057219058eba3cdbcb1a2f3b02167ff64dcc905b9ee65ffd +SHA512 (org.eclipse.linuxtools.eclipse-build-d5db901519674ad1dd5823a62bb6cec7a0f73fa3.tar.xz) = e459e345d08a643bcc11bd524772bda10c6a3423e16297724c7c5e84f95de7d965011b50a3d020fc172648a8c0700b7c30103cf42bf080d80cb9b77db79ba62d