Merge remote-tracking branch 'up/f29' into f29-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>

eclipse-debug-symbols.patch

@@ -1,6 +1,6 @@
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2018-08-19 12:37:52.764590467 +0100
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2018-08-19 12:38:15.032503913 +0100
-@@ -72,7 +72,8 @@
+@@ -75,7 +75,8 @@
  
  MAKE_TYPE=make
  
@@ -12,7 +12,7 @@
  if [ "${OS}" = "" ]; then
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig	2014-03-12 14:47:37.513191381 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	2014-03-12 14:47:45.672200015 +0000
-@@ -91,7 +91,7 @@
+@@ -94,7 +94,7 @@
   -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
   -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
  LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 

eclipse-ignore-version-when-calculating-home.patch

@@ -1,6 +1,6 @@
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig	2014-03-24 12:06:59.530918305 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java	2014-03-24 12:07:42.709932098 +0000
-@@ -1362,7 +1362,7 @@
+@@ -1383,7 +1383,7 @@
  				String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
  				if (appVersion == null || appVersion.trim().length() == 0)
  					appVersion = ""; //$NON-NLS-1$
@@ -11,7 +11,7 @@
  				// in the user's home dir.
 --- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java.orig	2014-03-24 12:05:52.666896971 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java	2014-03-24 12:06:46.076914704 +0000
-@@ -296,7 +296,7 @@
+@@ -308,7 +308,7 @@
  				String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
  				if (appVersion == null || appVersion.trim().length() == 0)
  					appVersion = ""; //$NON-NLS-1$

eclipse-p2-pick-up-renamed-jars.patch

@@ -1,6 +1,6 @@
 --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig	2018-04-25 15:35:44.914031196 +0100
 +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java	2018-04-25 15:36:17.546856697 +0100
-@@ -880,7 +880,7 @@
+@@ -885,7 +885,7 @@
  			//First check to see if there is already an IU around for this
  			IInstallableUnit bundleIU = queryForIU(result, bd.getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
  			IArtifactKey bundleArtKey = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());

eclipse-pde-tp-support-droplets.patch

@@ -27,7 +27,7 @@ diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/c
 index fbd4b81..55cd40e 100644
 --- eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
 +++ eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
-@@ -12,11 +12,12 @@
+@@ -15,11 +15,12 @@
  package org.eclipse.pde.internal.core;
  
  import java.io.*;
@@ -42,7 +42,7 @@ index fbd4b81..55cd40e 100644
  import org.eclipse.equinox.p2.core.IProvisioningAgent;
  import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
  import org.eclipse.equinox.p2.engine.*;
-@@ -29,6 +30,7 @@ import org.eclipse.osgi.service.resolver.*;
+@@ -32,6 +33,7 @@ import org.eclipse.osgi.service.resolver.*;
  import org.eclipse.pde.core.plugin.*;
  import org.eclipse.pde.internal.build.BundleHelper;
  import org.eclipse.pde.internal.core.plugin.PluginBase;
@@ -50,7 +50,7 @@ index fbd4b81..55cd40e 100644
  import org.osgi.framework.Constants;
  
  /**
-@@ -108,7 +110,16 @@ public class P2Utils {
+@@ -111,7 +113,16 @@ public class P2Utils {
  		try {
  			URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath());
  			File home = basePath.toFile();
@@ -68,7 +68,7 @@ index fbd4b81..55cd40e 100644
  			if (bundles == null || bundles.length == 0) {
  				return null;
  			}
-@@ -140,11 +151,38 @@ public class P2Utils {
+@@ -143,11 +154,38 @@ public class P2Utils {
  		try {
  			File home = basePath.toFile();
  			URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH));

eclipse-remove-jgit-provider.patch

@@ -1,6 +1,6 @@
 --- 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
-@@ -483,7 +483,7 @@
+@@ -491,7 +491,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>
-@@ -492,19 +492,19 @@
+@@ -500,19 +500,19 @@
                <groupId>org.eclipse.tycho.extras</groupId>
                <artifactId>tycho-sourceref-jgit</artifactId>
                <version>${tycho-extras.version}</version>

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       1
+%global bootstrap       0
 
 Epoch:                  1
 
-%global eb_commit       23577466b35eaf62bee3b00090f4fbedc555b4e6
-%global eclipse_tag     I20180822-0800
+%global eb_commit       44643cbda3dfd6f00fbf1b346dae7068df2a9ef9
+%global eclipse_tag     I20180906-0745
 
 %global _jetty_version  9.4.11
 %global _lucene_version 7.1.0
@@ -40,7 +40,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.9.0
-Release:        0.4.3.riscv64%{?dist}
+Release:        1.0.riscv64%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -132,6 +132,7 @@ BuildRequires: maven-assembly-plugin
 BuildRequires: maven-dependency-plugin
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-install-plugin
+BuildRequires: maven-shade-plugin
 BuildRequires: xml-maven-plugin
 BuildRequires: rhino
 BuildRequires: sonatype-oss-parent
@@ -647,11 +648,21 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/
 %build
 #This is the lowest value where the build succeeds. 512m is not enough.
 export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
+# Ensure we get the jit on arm
+%ifarch %{arm}
+export JAVA_HOME=$(ls -d %{_jvmdir}/java-1.8.0-openjdk-aarch32*)
+%else
 export JAVA_HOME=%{_jvmdir}/java
+%endif
+
+# Pre-build agent jar needed for AdvancedSourceLookupSupport
+sed -i -e '/createSourcesJar/d' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml
+(cd eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent && xmvn -o -B clean verify)
+mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded.jar \
+  eclipse.jdt.debug/org.eclipse.jdt.launching/lib
 
 # Qualifier generated from last modification time of source tarball
 QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
-
 %mvn_build -j -f -- -DforceContextQualifier=$QUALIFIER \
 %if %{bootstrap}
    -P !api-generation,!build-docs \
@@ -1069,9 +1080,13 @@ fi
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
-* Thu Sep 13 2018 David Abdurachmanov <david.abdurachmanov> - 1:4.9.0-0.4.3.riscv64
+* Mon Sep 17 2018 David Abdurachmanov <david.abdurachmanov> - 1:4.9.0-1.0.riscv64
 - Enable RISC-V (riscv64)
 
+* Wed Sep 12 2018 Mat Booth <mat.booth@redhat.com> - 1:4.9.0-1
+- Update to final bits for 4.9
+- Fix NPE due to missing agent jar
+
 * Thu Aug 23 2018 Mat Booth <mat.booth@redhat.com> - 1:4.9.0-0.4
 - Update to latest I-build
 - Full non-bootstrap build

sources

@@ -1,2 +1,2 @@
-SHA512 (eclipse-platform-sources-I20180822-0800.tar.xz) = c1158fa81c21a1fe9d09fd814062e55623b4ceca34be9b44c50f917f14bab8643e29ec6d20879c01b107fb93e68de4af553edea0fb606add870230d0498a03ef
-SHA512 (org.eclipse.linuxtools.eclipse-build-23577466b35eaf62bee3b00090f4fbedc555b4e6.tar.xz) = d268ea945c33b997c79b390f9592c1139f52dc39ebdb7ea7155d41301459827f576389e20080462ad22f2aef833857626df983bbb2abe30845e79ca74a194bea
+SHA512 (eclipse-platform-sources-I20180906-0745.tar.xz) = eed6fbb7d160713ba2c043e7b218a778fa493e1187fbaf6b0a36a231ab1a35d61ecc2793b179d911d6e34105534ab47cc2d0fabe54ac216b5371adab7606c6a5
+SHA512 (org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz) = ef02f54deefd154265122fa0191c8d69bbb135e026171de147a7fb3af83bb26523ea866d19aa7c7cc184c8e05ad55e54846a909bea69bd1bc6cd57005d055ebf