!41 Add support for riscv64 and disable org.eclipse.releng.tools for non-bootstrap

From: @DingliZhang Reviewed-by: @caodongxia Signed-off-by: @caodongxia
Add support for riscv64 and disable org.eclipse.releng.tools for non-bootstrap
2024-04-29 09:26:50 +00:00 · 2024-04-27 14:14:15 +08:00 · 2023-10-07 09:24:00 +00:00 · 2023-09-28 15:35:09 +08:00 · 2023-08-15 08:57:08 +00:00 · 2023-08-09 15:49:26 +08:00
11 changed files with 74889 additions and 74 deletions
--- a/CVE-2020-27225.patch
+++ b/CVE-2020-27225.patch
@ -0,0 +1,354 @@
+From 28aac2514656c669ffa16acb996c77def3d4a8d4 Mon Sep 17 00:00:00 2001
+From: Andrew Johnson
+Date: Tue, 16 Feb 2021 21:40:49 +0000
+Subject: 569855: Fix for Eclipse live help. - Use tokens - Backport to
+ R4_11_maintenance branch
+
+Change-Id: I09cee753dc24d55a2704b80ae13d392d233aac0d
+Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=569855
+Signed-off-by: Andrew Johnson <andrew_johnson@uk.ibm.com>(cherry picked from commit 90661664f30d4e1225e4a68b179c6ee110cd7f75)
+Also-by: Niraj Modi <niraj.modi@in.ibm.com>
+---
+ org.eclipse.help.base/META-INF/MANIFEST.MF         |  2 +-
+ org.eclipse.help.base/pom.xml                      |  2 +-
+ .../eclipse/help/internal/base/BaseHelpSystem.java | 29 ++++++++++++-
+ .../eclipse/help/internal/base/HelpDisplay.java    | 10 ++++-
+ org.eclipse.help.webapp/META-INF/MANIFEST.MF       |  2 +-
+ org.eclipse.help.webapp/advanced/livehelp_js.jsp   | 12 +++++-
+ org.eclipse.help.webapp/index.jsp                  | 32 ++++++++++++---
+ org.eclipse.help.webapp/pom.xml                    |  2 +-
+ .../help/internal/webapp/data/LayoutData.java      |  7 +++-
+ .../internal/webapp/servlet/LiveHelpServlet.java   | 48 +++++++++++++++++++++-
+ 10 files changed, 129 insertions(+), 17 deletions(-)
+
+diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF
+index 4ad860070..398a6829a 100644
+--- a/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.base/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %help_base_plugin_name
+ Bundle-SymbolicName: org.eclipse.help.base; singleton:=true
+-Bundle-Version: 4.2.500.qualifier
+Bundle-Version: 4.2.501.qualifier
+ Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+diff --git a/org.eclipse.help.base/pom.xml b/org.eclipse.help.base/pom.xml
+index b90d899f6..36f5145e9 100644
+--- a/org.eclipse.help.base/pom.xml
+++ b/org.eclipse.help.base/pom.xml
+@@ -18,7 +18,7 @@
+   </parent>
+   <groupId>org.eclipse.help</groupId>
+   <artifactId>org.eclipse.help.base</artifactId>
+-  <version>4.2.500-SNAPSHOT</version>
+  <version>4.2.501-SNAPSHOT</version>
+   <packaging>eclipse-plugin</packaging>
+   <properties>
+     <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
+diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
+index 2ea5bf807..f9f09ae7a 100644
+--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2021 IBM Corporation and others.
+  *
+  * This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License 2.0
+@@ -15,6 +15,7 @@ package org.eclipse.help.internal.base;
+ 
+ import java.net.MalformedURLException;
+ import java.net.URL;
+
+ import org.eclipse.core.runtime.CoreException;
+ import org.eclipse.core.runtime.IProduct;
+ import org.eclipse.core.runtime.IStatus;
+@@ -59,6 +60,7 @@ public final class BaseHelpSystem {
+ 	private IBrowser browser;
+ 	private IBrowser internalBrowser;
+ 	private HelpDisplay helpDisplay = null;
+	private String liveHelpToken = null;
+ 
+ 	private BaseHelpSystem() {
+ 		super();
+@@ -350,4 +352,29 @@ public final class BaseHelpSystem {
+ 		}
+ 	}
+ 
+	/**
+	 * Check supplied token against stored token. Clears the stored token if
+	 * successful.
+	 * 
+	 * @param helpSessionToken
+	 * @return true if match successful
+	 */
+	public boolean matchOnceLiveHelpToken(String helpSessionToken) {
+		/*
+		 * @FIXME - should we use a constant time comparison, and store/compare a
+		 * cryptographic hash?
+		 */
+		if (liveHelpToken != null && liveHelpToken.equals(helpSessionToken)) {
+			// Enforce one-time use.
+			liveHelpToken = null;
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public void setLiveHelpToken(String helpSessionToken) {
+		liveHelpToken = helpSessionToken;
+	}
+
+ }
+diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
+index 28ebfd10d..33a0e08fd 100644
+--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2021 IBM Corporation and others.
+  *
+  * This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License 2.0
+@@ -15,6 +15,8 @@ package org.eclipse.help.internal.base;
+ 
+ import java.io.UnsupportedEncodingException;
+ import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+ 
+ import org.eclipse.core.runtime.CoreException;
+ import org.eclipse.core.runtime.IConfigurationElement;
+@@ -196,6 +198,12 @@ public class HelpDisplay {
+ 				String topic = helpURL.substring("topic=".length()); //$NON-NLS-1$
+ 				helpURL = getHelpDisplay().getHelpForTopic( topic, WebappManager.getHost(),  WebappManager.getPort());
+ 			}
+			String basehelp = getBaseURL();
+			if (BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER && helpURL.startsWith(basehelp)) {
+				String sessid = UUID.randomUUID().toString();
+				BaseHelpSystem.getInstance().setLiveHelpToken(sessid);
+				helpURL += (helpURL.indexOf('?') < 0 ? '?' : '&') + "token=" + sessid; //$NON-NLS-1$
+			}
+ 
+ 			BaseHelpSystem.getHelpBrowser(forceExternal)
+ 						.displayURL(helpURL);
+diff --git a/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/org.eclipse.help.webapp/META-INF/MANIFEST.MF
+index 0c85d674e..c943158a6 100644
+--- a/org.eclipse.help.webapp/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.webapp/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %help_webapp_plugin_name
+ Bundle-SymbolicName: org.eclipse.help.webapp;singleton:=true
+-Bundle-Version: 3.9.400.qualifier
+Bundle-Version: 3.9.401.qualifier
+ Bundle-Activator: org.eclipse.help.internal.webapp.HelpWebappPlugin
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+diff --git a/org.eclipse.help.webapp/advanced/livehelp_js.jsp b/org.eclipse.help.webapp/advanced/livehelp_js.jsp
+index 23362f89e..6d04945d6 100644
+--- a/org.eclipse.help.webapp/advanced/livehelp_js.jsp
+++ b/org.eclipse.help.webapp/advanced/livehelp_js.jsp
+@@ -1,5 +1,5 @@
+ <%--
+- Copyright (c) 2000, 2018 IBM Corporation and others.
+ Copyright (c) 2000, 2021 IBM Corporation and others.
+ 
+  This program and the accompanying materials 
+  are made available under the terms of the Eclipse Public License 2.0
+@@ -47,7 +47,15 @@ function liveActionInternal(topHelpWindow, pluginId, className, argument)
+ 	url=url.substring(0, i+1);
+ 	var encodedArg=encodeURIComponent(argument);
+ 	url=url+"livehelp/?pluginID="+pluginId+"&class="+className+"&arg="+encodedArg+"&nocaching="+Math.random();
+-
+	<%
+	Object token = request.getSession().getAttribute("LSESSION"); //$NON-NLS-1$
+	// Validate token to protect against XSS
+	if (token instanceof String && ((String)token).matches("[a-z0-9-]{36}")) {//$NON-NLS-1$) {
+	%>
+	url=url+"&token=<%=token%>";
+	<%
+	}
+	%>
+ 	// we need to find the toolbar frame.
+ 	// to do: cleanup this, including the location of the hidden livehelp frame.	
+ 	var toolbarFrame = topHelpWindow.HelpFrame.ContentFrame.ContentToolbarFrame;
+diff --git a/org.eclipse.help.webapp/index.jsp b/org.eclipse.help.webapp/index.jsp
+index 34d3e14ee..76b6564c1 100644
+--- a/org.eclipse.help.webapp/index.jsp
+++ b/org.eclipse.help.webapp/index.jsp
+@@ -1,5 +1,5 @@
+ <%--
+- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2021 IBM Corporation and others.
+ 
+  This program and the accompanying materials 
+  are made available under the terms of the Eclipse Public License 2.0
+@@ -12,9 +12,11 @@
+      IBM Corporation - initial API and implementation
+ --%>
+ <%@ page import="org.eclipse.help.internal.webapp.data.*" errorPage="/advanced/err.jsp" contentType="text/html; charset=UTF-8"%>
+<%@ page import="java.util.UUID" %>
+<%@ page import="org.eclipse.help.internal.base.BaseHelpSystem" %>
+ <%
+ 	request.setCharacterEncoding("UTF-8");
+-	ServerState.webappStarted(application,request, response);	
+	ServerState.webappStarted(application,request, response);
+ 	// Read the scope parameter
+ 	RequestScope.setScopeFromRequest(request, response);
+ 	LayoutData data = new LayoutData(application,request, response);
+@@ -38,9 +40,27 @@
+ </body>
+ </html>	
+ <%
+-	}else if(data.isAdvancedUI()){
+-		request.getRequestDispatcher("/advanced/index.jsp" + data.getQuery()).forward(request, response);
+-	}else{
+-		request.getRequestDispatcher("/basic/index.jsp" + data.getQuery()).forward(request, response);
+	} else {
+		// For live help
+		String token = request.getParameter("token"); //$NON-NLS-1$
+		if (token != null && token.matches("[a-z0-9-]{36}")) { //$NON-NLS-1$
+			if (BaseHelpSystem.getInstance().matchOnceLiveHelpToken(token)) {
+				// Only one session can grab this
+				if (request.getSession().getAttribute("XSESSION") == null) { //$NON-NLS-1$
+					String token2 = UUID.randomUUID().toString();
+					request.getSession().setAttribute("XSESSION", token2); //$NON-NLS-1$
+					int port = request.getLocalPort();
+					response.addHeader("Set-Cookie", "XSESSION-" + port + "=" + token2 + "; HttpOnly; SameSite=Strict"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+					String token3 = UUID.randomUUID().toString();
+					request.getSession().setAttribute("LSESSION", token3); //$NON-NLS-1$
+				}
+			}
+		}
+
+		if(data.isAdvancedUI()){
+			request.getRequestDispatcher("/advanced/index.jsp" + data.getQuery()).forward(request, response);
+		} else { // legacy UI
+			request.getRequestDispatcher("/basic/index.jsp" + data.getQuery()).forward(request, response);
+		}
+ 	}
+ %>
+diff --git a/org.eclipse.help.webapp/pom.xml b/org.eclipse.help.webapp/pom.xml
+index 51e7cc9e7..e02982e8c 100644
+--- a/org.eclipse.help.webapp/pom.xml
+++ b/org.eclipse.help.webapp/pom.xml
+@@ -18,7 +18,7 @@
+   </parent>
+   <groupId>org.eclipse.help</groupId>
+   <artifactId>org.eclipse.help.webapp</artifactId>
+-  <version>3.9.400-SNAPSHOT</version>
+  <version>3.9.401-SNAPSHOT</version>
+   <packaging>eclipse-plugin</packaging>
+   <build>
+     <plugins>
+diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
+index d5183e1ab..49a45423b 100644
+--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/LayoutData.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2021 IBM Corporation and others.
+  *
+  * This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License 2.0
+@@ -46,6 +46,11 @@ public class LayoutData extends RequestData {
+ 
+ 		// initialize the query string
+ 		String qs = request.getQueryString();
+		// Remove any live help token
+		if (qs != null) {
+			qs = qs.replaceFirst("^token=[a-z0-9-]{36}", ""); //$NON-NLS-1$ //$NON-NLS-2$
+			qs = qs.replaceFirst("&token=[a-z0-9-]{36}", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+ 		if (qs != null && qs.length() > 0)
+ 			query = "?" + qs; //$NON-NLS-1$
+ 	}
+diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
+index ded00b1c1..a2959a6a8 100644
+--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2021 IBM Corporation and others.
+  *
+  * This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License 2.0
+@@ -14,8 +14,8 @@
+ package org.eclipse.help.internal.webapp.servlet;
+ 
+ import java.io.IOException;
+-
+ import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+ import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+@@ -51,6 +51,45 @@ public class LiveHelpServlet extends HttpServlet {
+ 			return;
+ 		}
+ 		req.setCharacterEncoding("UTF-8"); //$NON-NLS-1$
+		String sessionid = req.getSession().getId();
+		Cookie cookies[] = req.getCookies();
+		boolean jsessOK = false;
+		boolean xsessOK = false;
+		boolean lsessOK = false;
+		// Unique session ID per help server
+		int port = req.getLocalPort();
+		String xsessname = "XSESSION-" + port; //$NON-NLS-1$
+		if (cookies != null) {
+			for (Cookie cookie : cookies) {
+				if (cookie.getName().equals("JSESSIONID")) {//$NON-NLS-1$
+					if (sessionid.length() >= 30 &&
+							cookie.getValue().startsWith(sessionid)) {
+						jsessOK = true;
+					}
+				}
+				if (cookie.getName().equals(xsessname)) {
+					if (cookie.getValue().equals(req.getSession().getAttribute("XSESSION"))) { //$NON-NLS-1$
+						xsessOK = true;
+					}
+				}
+			}
+		}
+		String token = req.getParameter("token"); //$NON-NLS-1$
+		if (token != null && token.equals(req.getSession().getAttribute("LSESSION"))) { //$NON-NLS-1$
+			lsessOK = true;
+		}
+		if (!jsessOK) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN, "JSESSIONID"); //$NON-NLS-1$
+			return;
+		}
+		if (!lsessOK) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN, "token"); //$NON-NLS-1$
+			return;
+		}
+		if (!xsessOK) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN, xsessname);
+			return;
+		}
+ 		String pluginID = req.getParameter("pluginID"); //$NON-NLS-1$
+ 		if (pluginID == null)
+ 			return;
+@@ -59,6 +98,11 @@ public class LiveHelpServlet extends HttpServlet {
+ 			return;
+ 		String arg = req.getParameter("arg"); //$NON-NLS-1$
+ 		BaseHelpSystem.runLiveHelp(pluginID, className, arg);
+		/*
+		 * @FIXME Should runLiveHelp return an error if the plugin/class is wrong
+		 * so a SC_BAD_REQUEST can be returned? Or does this reveal too much?
+		 */
+		resp.setStatus(HttpServletResponse.SC_ACCEPTED);
+ 	}
+ 	/**
+ 	 *
+-- 
+cgit v1.2.3
+
--- a/Remove-32-bit-code.patch
+++ b/Remove-32-bit-code.patch
--- a/Remove-32-bit-from-build-scripts.patch
+++ b/Remove-32-bit-from-build-scripts.patch
@ -0,0 +1,189 @@
+From cdf280bd9520d91fcd43cc3099c9764296278945 Mon Sep 17 00:00:00 2001
+From: Eric Williams
+Date: Wed, 27 Mar 2019 09:45:24 -0400
+Subject: Bug 545793: [GTK] Remove 32-bit code
+
+Remove 32 bit from build scripts.
+
+Change-Id: Ib9c66468ae30a0a25045c95f7e606b8d404c09fd
+Signed-off-by: Eric Williams <ericwill@redhat.com>---
+ bundles/org.eclipse.swt/buildFragment.xml | 25 ---------------
+ bundles/org.eclipse.swt/buildSWT.xml      | 51 ++-----------------------------
+ 2 files changed, 2 insertions(+), 74 deletions(-)
+
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+index b4944c59d5..180c92ca32 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+@@ -156,7 +156,6 @@
+ 			<fileset dir="${plugindir}/Eclipse SWT Program/common/"/>
+ 		</copy>
+ 		<antcall target="copy.translationfiles"/>
+-		<antcall target="replace64"/>
+ 	</target>
+ 
+ 	<target name="copy.gtk.src">
+@@ -192,7 +191,6 @@
+ 			<fileset dir="${plugindir}/Eclipse SWT WebKit/gtk/"/>
+ 		</copy>
+ 		<antcall target="copy.translationfiles"/>
+-		<antcall target="replace64"/>
+ 	</target>
+ 		
+ 	<target name="copy.win32.src">
+@@ -223,7 +221,6 @@
+ 			<fileset dir="${plugindir}/Eclipse SWT Program/win32/"/>
+ 		</copy>
+ 		<antcall target="copy.translationfiles"/>
+-		<antcall target="replace64"/>
+ 	</target>
+ 
+ 	<target name="copy.translationfiles" if="includetranslationfiles">
+@@ -233,28 +230,6 @@
+ 		</copy>
+ 	</target>
+ 
+-	<target name="is64">
+-		<condition property="is64" value="true">
+-			<or>
+-				<equals arg1="${swt.arch}" arg2="x86_64"/>
+-				<equals arg1="${swt.arch}" arg2="ia64"/>
+-				<equals arg1="${swt.arch}" arg2="ppc64le"/>
+-				<equals arg1="${swt.arch}" arg2="s390x"/>
+-				<equals arg1="${swt.arch}" arg2="sparcv9"/>
+-				<equals arg1="${swt.arch}" arg2="aarch64"/>
+-			</or>
+-		</condition>
+-		<echo>Is64=${is64}</echo>
+-	</target>
+-		
+-    <target name="replace64" depends="is64" unless="is64">
+-    	<echo>Converting java files to 32 bit</echo>
+-    	<replace dir="${copy.src.dir}" includes="**/*.java" value="int /*long*/" token="long /*int*/"/>
+-    	<replace dir="${copy.src.dir}" includes="**/*.java" value="int[] /*long[]*/" token="long[] /*int[]*/"/>
+-    	<replace dir="${copy.src.dir}" includes="**/*.java" value="float /*double*/" token="double /*float*/"/>
+-    	<replace dir="${copy.src.dir}" includes="**/*.java" value="float[] /*double[]*/" token="double[] /*float[]*/"/>
+-    </target>
+-
+ 	<target name="build.sources" depends="init">
+ 		<available property="src.zip" file="${build.result.folder}/src.zip" />
+ 		<antcall target="src.zip" />
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+index bf4faf75b9..9d4bb1b6fe 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+@@ -108,13 +108,6 @@
+ 
+ 	<target name="check_machines" depends="init_keyfile">
+ 		<parallel>
+-		<sshexec host="${m_linux_x86}"
+-			username="swtbuild"
+-			keyfile="${keyfile}"
+-			failonerror="false"
+-			trust="true"
+-			outputproperty="m_linux_x86_output"
+-			command="hostname"/>
+ 		<sshexec host="${m_linux_x86_64}"
+ 			username="swtbuild"
+ 			keyfile="${keyfile}"
+@@ -140,12 +133,6 @@
+ 		</parallel>
+ 		<property name="success_msg" value="Success"/>
+ 		<property name="fail_msg" value="*** Fail ***"/>
+-		<condition property="m_linux_x86_test" value="${success_msg}" else="${fail_msg}">
+-			<and>
+-				<length string="${m_linux_x86_output}" when="greater" length="0"/>
+-				<matches pattern="x${m_linux_x86_output}*" string="x${m_linux_x86}"/>
+-			</and>
+-		</condition>
+ 		<condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}">
+ 			<and>
+ 				<length string="${m_linux_x86_64_output}" when="greater" length="0"/>
+@@ -167,13 +154,12 @@
+ 		<echo>-------------------------</echo>
+ 		<echo>Status:</echo>
+ 		<echo></echo>
+-		<echo>${m_linux_x86} - ${m_linux_x86_test}</echo>
+ 		<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>
+ 		<echo>${m_linux_ppc64le} - ${m_linux_ppc64le_test}</echo>
+ 		<echo>${m_mac} - ${m_mac_test}</echo>
+ 		<echo>-------------------------</echo>
+ 		<condition property="m_fail">
+-			<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/>
+			<matches pattern="Fail" string="${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/>
+ 		</condition>
+ 		<fail if="m_fail" message="Failed"/>
+ 	</target>
+@@ -237,15 +223,12 @@
+ 		<!-- 64 bit -->
+ 		<antcall target="build_classes">
+ 			<param name="cp" value=".classpath_cocoa"/>
+-			<param name="is64" value="64 bit"/>
+ 		</antcall>
+ 		<antcall target="build_classes">
+ 			<param name="cp" value=".classpath_gtk"/>
+-			<param name="is64" value="64 bit"/>
+ 		</antcall>
+ 		<antcall target="build_classes">
+ 			<param name="cp" value=".classpath_win32"/>
+-			<param name="is64" value="64 bit"/>
+ 		</antcall>
+ 		
+ 		<antcall target="check_preprocessing"/>
+@@ -263,14 +246,8 @@
+ 		<delete dir="${tmpdir}" quiet="true"/>
+ 	</target>
+ 
+-	<target name="replace64" unless="is64">
+-		<antcall target="replace.64.to.32">
+-			<param name="replace_dir" value="${buildDir}"/>
+-		</antcall>
+-	</target>
+-
+ 	<target name="build_classes">
+-		<echo>Building ${cp} ${is64}</echo>
+		<echo>Building ${cp}</echo>
+ 		<delete file="${tmpdir}/copy.xml"/>
+ 		<delete dir="${buildDir}"/>
+ 
+@@ -280,8 +257,6 @@
+ 		</xslt>
+ 		<ant antfile="${tmpdir}/copy.xml" target="copy_files"/>
+ 
+-		<antcall target="replace64"></antcall>
+-
+ 		<javac includeantruntime="false" srcdir="${buildDir}"></javac>
+ 	</target>
+ 
+@@ -947,28 +922,6 @@
+ 		</exec>
+ 	</target>
+ 	
+-	<!-- Convert SWT 32 bit java and C source to 64 bit  -->
+-	<target name="replace.32.to.64" depends="init_build">
+-		<property name="replace_dir" value="${repo.src}/bundles/org.eclipse.swt"/>
+-		<echo>Converting java files to 64 bit in ${replace_dir} project</echo>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="int[] /*long[]*/" value="long[] /*int[]*/"/>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="float /*double*/" value="double /*float*/"/>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="float[] /*double[]*/" value="double[] /*float[]*/"/>
+-		<antcall target="init_build"/>
+-	</target>
+-
+-	<!-- Convert SWT 64 bit java and C source to 32 bit  -->
+-	<target name="replace.64.to.32" depends="init_build">
+-		<property name="replace_dir" value="${repo.src}/bundles/org.eclipse.swt"/>
+-		<echo>Converting java files to 32 bit in ${replace_dir} project</echo>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="long /*int*/" value="int /*long*/"/>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="long[] /*int[]*/" value="int[] /*long[]*/"/>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="double /*float*/" value="float /*double*/"/>
+-		<replace dir="${replace_dir}" includes="**/*.java" token="double[] /*float[]*/" value="float[] /*double[]*/"/>
+-		<antcall target="init_build"/>
+-	</target>
+-	
+ 	<!-- ******************************************************************************** -->
+ 	<!-- targets to run the builds on the Eclipse Foundation Hudson in master-slave setup -->
+ 	<!-- ******************************************************************************** -->
+-- 
+cgit v1.2.3
+
--- a/Remove-more-32-bit-code.patch
+++ b/Remove-more-32-bit-code.patch
--- a/Remove-traces-of-32-bit-support.patch
+++ b/Remove-traces-of-32-bit-support.patch
--- a/add_loongarch-support.patch
+++ b/add_loongarch-support.patch
@ -0,0 +1,305 @@
+diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
+index 5a2d0d8..3d3af6a 100644
+--- a/eclipse.platform.swt.binaries/pom.xml
+++ b/eclipse.platform.swt.binaries/pom.xml
+@@ -56,6 +56,7 @@
+     <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
+    <module>bundles/org.eclipse.swt.gtk.linux.loongarch64</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+index c783f77..746ea70 100755
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
+@@ -112,6 +112,10 @@ case $MODEL in
+ 		SWT_ARCH=x86
+ 		AWT_ARCH=i386
+ 		;;
+	"loongarch64")
+		SWT_ARCH=loongarch64
+		AWT_ARCH=loongarch64
+		;;
+ 	*)
+ 		SWT_ARCH=$MODEL
+ 		AWT_ARCH=$MODEL
+@@ -180,6 +184,17 @@ case $SWT_OS.$SWT_ARCH in
+ 			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/"
+ 		fi
+ 		;;
+	"linux.loongarch64")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"`
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/"
+		fi
+		;;
+ 	"linux.s390x")
+ 		if [ "${CC}" = "" ]; then
+ 			export CC=gcc
+@@ -195,7 +210,7 @@ esac
+ 
+ 
+ # For 64-bit CPUs, we have a switch
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ]; then
+ 	SWT_PTR_CFLAGS=-DJNI64
+ 	if [ -d /lib64 ]; then
+ 		XLIB64=-L/usr/X11R6/lib64
+@@ -215,6 +230,11 @@ if [ ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ]; then
+ 	export SWT_LFLAGS SWT_PTR_CFLAGS
+ fi
+ 
+if [ ${MODEL} = 'loongarch64' -a ${SWT_OS} = 'linux' ]; then
+       SWT_LFLAGS=-o32
+       export SWT_LFLAGS SWT_PTR_CFLAGS
+fi
+
+ if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
+ 	func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library."
+ 	MAKE_CAIRO=make_cairo
+@@ -365,4 +385,4 @@ elif [ "${GTK_VERSION}" = "4.0" ]; then
+ elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
+ 	export GTK_VERSION="3.0"
+ 	func_build_gtk3 "$@"
+-fi
+\ No newline at end of file
+fi
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+index b5b0b82..b9494a3 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+@@ -44,3 +44,8 @@ requires.9.namespace = org.eclipse.equinox.p2.iu
+ requires.9.name = org.eclipse.swt.gtk.linux.x86
+ requires.9.range = [$version$,$version$]
+ requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
+
+requires.10.namespace = org.eclipse.equinox.p2.iu
+requires.10.name = org.eclipse.swt.gtk.linux.loongarch64
+requires.10.range = [$version$,$version$]
+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=loongarch64)(!(org.eclipse.swt.buildtime=true)))
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+index bf4faf7..04a0e3d 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+@@ -69,6 +69,10 @@
+ 			<param name="library_count" value="8"/>
+ 			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
+ 		</antcall>
+		<antcall target="check_fragment_libraries">
+			<param name="library_count" value="8"/>
+			<param name="fragment" value="org.eclipse.swt.gtk.linux.loongarch64"/>
+		</antcall>
+ 		<antcall target="check_fragment_libraries">
+ 			<param name="library_count" value="4"/>
+ 			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
+@@ -80,12 +84,12 @@
+ 		<property name="checkdir" value="~/build/check_libraries"/>
+ 		<property name="library_count" value="23"/>
+ 		<property name="fragment" value=""/>
+-		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
+		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.loongarch64/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
+ 			<filename regex="[0-9][0-9][0-9][0-9]."/>
+ 			<filename regex="${swt_version}."/>
+ 			<exclude name="**/.git/**"/>
+ 		</fileset>
+-		<fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
+		<fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.ppc64le/**,  **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
+ 			<filename regex="[0-9][0-9][0-9][0-9]."/>
+ 			<filename regex="${swt_version}." negate="true"/>
+ 			<exclude name="**/.git/**"/>
+@@ -122,6 +126,13 @@
+ 			trust="true"
+ 			outputproperty="m_linux_x86_64_output"
+ 			command="hostname"/>
+		<sshexec host="${m_linux_loongarch64}"
+			username="swtbuild"
+			keyfile="${keyfile}"
+			failonerror="false"
+			trust="true"
+			outputproperty="m_linux_loongarch64_output"
+			command="hostname"/>
+ 		<sshexec host="${m_linux_ppc64le}"
+ 			port="2256"
+ 			username="swtbuild"
+diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
+index 57809d6..c7b2d41 100644
+--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
+@@ -44,6 +44,7 @@
+                 <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
+                 <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.loongarch64" />
+                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
+                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" />
+                 <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
+diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+index 43136d3..a905ab5 100755
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+@@ -101,6 +101,11 @@ case $defaultOS in
+ 				defaultJavaHome=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"`
+ 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ 				;;
+                       "loongarch64")
+                               defaultOSArch="loongarch64"
+                               defaultJava=DEFAULT_JAVA_EXEC
+                               OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+                               ;;
+ 			"s390")
+ 				defaultOSArch="s390"
+ 				defaultJava=DEFAULT_JAVA_EXEC
+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 cce14c4..c2db96e 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
+@@ -129,6 +129,7 @@
+                         <include name="cocoa/macosx/x86_64/**/*"/>
+                         <include name="gtk/linux/arm/**/*"/>
+                         <include name="gtk/linux/aarch64/**/*"/>
+                        <include name="gtk/linux/loongarch64/**/*"/>
+                         <include name="gtk/linux/ppc64le/**/*"/>
+                         <include name="gtk/linux/s390x/**/*"/>
+                         <include name="gtk/linux/x86/**/*"/>
+diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
+index 741e9b3..6146da7 100644
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
+@@ -29,3 +29,6 @@ root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName}
+ root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
+ root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
+ 
+root.linux.gtk.loongarch64=bin/gtk/linux/loongarch64,gtk_root
+root.linux.gtk.loongarch64.permissions.755=launcher
+
+diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
+index 44c1737..02de3f1 100644
+--- a/rt.equinox.framework/pom.xml
+++ b/rt.equinox.framework/pom.xml
+@@ -61,6 +61,18 @@
+ 	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
+       </modules>
+     </profile>
+    <profile>
+      <id>build-native-launchers-gtk.linux.loongarch64</id>
+      <activation>
+	<property>
+	  <name>native</name>
+	  <value>gtk.linux.loongarch64</value>
+        </property>
+      </activation>
+      <modules>
+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.loongarch64</module>
+      </modules>
+    </profile>
+     <profile>
+       <id>build-native-launchers-gtk.linux.aarch64</id>
+       <activation>
+@@ -110,6 +122,7 @@
+     <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.loongarch64</module>
+     <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>
+ 
+     <module>bundles/org.eclipse.osgi.tests</module>
+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 134aaea..3dd4d45 100644
+--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+@@ -324,6 +324,16 @@
+          version="0.0.0"
+          fragment="true"/>
+ 
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.loongarch64"
+         os="linux"
+         ws="gtk"
+         arch="loongarch64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+    <plugin
+          id="org.eclipse.equinox.launcher.gtk.linux.s390x"
+          os="linux"
+@@ -468,6 +478,17 @@
+          fragment="true"
+          unpack="false"/>
+ 
+   <plugin
+         id="org.eclipse.swt.gtk.linux.loongarch64"
+         os="linux"
+         ws="gtk"
+         arch="loongarch64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+    <plugin
+          id="org.eclipse.swt.gtk.linux.x86"
+          os="linux"
+diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
+index c7fab60..af3d531 100755
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
+@@ -51,6 +51,16 @@
+          version="0.0.0"
+          fragment="true"/>
+ 
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.loongarch64"
+         os="linux"
+         ws="gtk"
+         arch="loongarch64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+    <plugin
+          id="org.eclipse.equinox.launcher.win32.win32.x86_64"
+          os="win32"
+diff --git a/eclipse.platform.swt/pom.xml b/eclipse.platform.swt/pom.xml
+index b101bc0..22e1590 100644
+--- a/eclipse.platform.swt/pom.xml
+++ b/eclipse.platform.swt/pom.xml
+@@ -80,7 +80,7 @@
+ 		<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
+ 	</properties>
+     </profile>
+-    <profile>
+    <!--profile>
+       <id>unix</id>
+       <activation>
+         <os>
+@@ -91,7 +91,7 @@
+ 	  <modules>
+ 	    <module>tests/org.eclipse.swt.tests.gtk</module>
+ 	  </modules>
+-    </profile>
+    </profile-->
+     <profile>
+       <id>windows</id>
+       <activation>
+diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
+index 7f6dc63..5c81817 100644
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
+@@ -44,3 +44,6 @@ root.linux.gtk.s390x.permissions.755=launcher
+ 
+ root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
+ root.linux.gtk.x86.permissions.755=launcher
+
+root.linux.gtk.loongarch64=bin/gtk/linux/loongarch64,gtk_root
+root.linux.gtk.loongarch64.permissions.755=launcher
--- a/eclipse-feature-plugins-to-category-ius.patch
+++ b/eclipse-feature-plugins-to-category-ius.patch
@ -20,13 +20,12 @@ diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.e
 index 06887d901..364cae9d8 100644
 --- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
 +++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
-@@ -19,6 +19,23 @@
+@@ -19,6 +19,22 @@
       %license
    </license>
 
 +   <requires>
 +      <import plugin="org.junit" />
-+      <import plugin="org.hamcrest.core" />
 +      <import plugin="org.junit.jupiter.api" />
 +      <import plugin="org.junit.jupiter.engine" />
 +      <import plugin="org.junit.jupiter.migrationsupport" />
@ -196,7 +195,7 @@ index f3432dba5..c70631e90 100644
 -                  <requirement>
 -                    <type>eclipse-plugin</type>
 -                    <id>javax.el</id>
-+                    <id>javax.el-api</id>
+                    <id>jakarta.el-api</id>
                     <versionRange>0.0.0</versionRange>
                   </requirement>
                   <requirement>
@ -418,15 +417,13 @@ diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
 index a3a7d14a0..f0dab84a3 100644
 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
 +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-@@ -19,6 +19,15 @@
+@@ -19,6 +19,13 @@
       %license
    </license>
 
 +   <requires>
 +      <import plugin="org.apache.commons.fileupload" />
 +      <import plugin="org.apache.commons.io" />
-+      <import plugin="org.hamcrest.core" />
-+      <import plugin="org.hamcrest.library" />
 +      <import plugin="org.mockito" />
 +      <import plugin="org.objenesis" />
 +   </requires>
@ -501,15 +498,13 @@ diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.x
 index 1dcc94c1c..2a4871027 100644
 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
 +++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
-@@ -19,6 +19,14 @@
+@@ -19,6 +19,12 @@
       %license
    </license>
 
 +   <requires>
 +      <import plugin="org.junit" />
 +      <import plugin="org.easymock" />
-+      <import plugin="org.hamcrest.core" />
-+      <import plugin="org.hamcrest.library" />
 +      <import plugin="org.mockito" />
 +   </requires>
 +
--- a/eclipse.spec
+++ b/eclipse.spec
@ -11,7 +11,7 @@
 Name:                eclipse
 Epoch:               1
 Version:             4.11
-Release:             6
+Release:             11
 Summary:             An open, extensible IDE
 License:             EPL-2.0
 URL:                 http://www.eclipse.org/
@ -20,7 +20,6 @@ Source1:             http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.
 Patch0:              eclipse-no-source-for-dependencies.patch
 Patch1:              eclipse-p2-pick-up-renamed-jars.patch
 Patch2:              eclipse-ignore-version-when-calculating-home.patch
-Patch3:              explicit-hamcrest.patch
 Patch4:              eclipse-secondary-arches.patch
 Patch5:              eclipse-debug-symbols.patch
 Patch12:             eclipse-fix-dropins.patch
@ -45,6 +44,15 @@ Patch34:             BUILD-FAILED-with-compilation-failure-in-org-eclipse-test.p
 #Patch from: https://git.eclipse.org/c/platform/eclipse.platform.ui.git/commit/?id=3cf23b7d8b0fc4e57f18118cb6fc92a8e6de0490
 Patch35:             fixed-compilation-error.patch
 Patch36:	     fix-objectweb-asm-version-to-increase.patch
+# https://git.eclipse.org/c/platform/eclipse.platform.ua.git/commit/?id=28aac2514656c669ffa16acb996c77def3d4a8d4
+Patch37:             CVE-2020-27225.patch
+Patch38:             add_loongarch-support.patch
+Patch39:             riscv.patch
+Patch40:             Remove-traces-of-32-bit-support.patch
+Patch41:             Remove-32-bit-code.patch
+Patch42:             Remove-32-bit-from-build-scripts.patch
+Patch43:             Remove-more-32-bit-code.patch
+Patch44:             switch-to-the-new-httpclient45-ECF-provider_2.patch
 ExcludeArch:         s390 %{arm} %{ix86}
 BuildRequires:       maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin
 BuildRequires:       maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin
@ -75,12 +83,12 @@ BuildRequires:       lucene-analyzers-smartcn >= %{_lucene_version} junit >= 4.1
 BuildRequires:       apiguardian hamcrest sat4j objectweb-asm >= 7.0 sac batik >= 1.10
 BuildRequires:       batik-css >= 1.10 xmlgraphics-commons >= 2.2 xml-commons-apis atinject
 BuildRequires:       eclipse-ecf-core >= 3.14.4 eclipse-emf-core >= 1:2.16.0 eclipse-license2
-BuildRequires:       glassfish-annotation-api glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1
-BuildRequires:       glassfish-jsp-api >= 2.2.1 glassfish-jsp >= 2.2.5
-BuildRequires:       glassfish-servlet-api >= 3.1.0 httpcomponents-core httpcomponents-client jsoup
+BuildRequires:       glassfish-annotation-api glassfish-el-api > 3.0.1 glassfish-el > 3.0.1
+BuildRequires:       glassfish-jsp-api <= 2.3.3 glassfish-jsp <= 2.3.3
+BuildRequires:       glassfish-servlet-api <= 3.1.0 httpcomponents-core httpcomponents-client jsoup
 BuildRequires:       xz-java mockito >= 2.23.9 osgi(osgi.annotation)
 %if ! %{bootstrap}
-BuildRequires:       eclipse-pde eclipse-egit eclipse-emf-runtime eclipse-jgit
+BuildRequires:       eclipse-pde eclipse-emf-runtime jgit
 %endif
 %description
 The Eclipse platform is designed for building integrated development
@ -142,7 +150,6 @@ Summary:             Eclipse Java Development Tools
 BuildArch:           noarch
 Provides:            %{name} = %{epoch}:%{version}-%{release}
 Requires:            %{name}-platform = %{epoch}:%{version}-%{release} junit >= 4.12 junit5 >= 5.4.0
-Requires:            osgi(org.hamcrest.core)
 Obsoletes:           eclipse-recommenders <= 2.5.4
 %description    jdt
 Eclipse Java Development Tools.  This package is required to use Eclipse for
@ -168,18 +175,13 @@ installer UIs.

 %package        contributor-tools
 Summary:             Tools for Eclipse Contributors
+Obsoletes:           %{name}-tests <= %{epoch}:%{version}-%{release}
 Requires:            %{name}-platform = %{epoch}:%{version}-%{release} easymock hamcrest
 Requires:            mockito >= 2.23.9
 %description    contributor-tools
 This package contains tools specifically for Eclipse contributors. It includes
 SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks.

-%package        tests
-Summary:             Eclipse Tests
-Requires:            %{name}-contributor-tools = %{epoch}:%{version}-%{release}
-%description    tests
-Eclipse Tests.
-
 %prep
 %setup -T -c
 tar --strip-components=1 -xf %{SOURCE0}
@ -194,7 +196,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
 %patch0
 %patch1
 %patch2
-%patch3
 %patch4 -p1
 %patch5
 %patch12
@ -217,7 +218,34 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
 %patch34
 %patch35 -p1
 %patch36 -p1
-rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
+pushd eclipse.platform.ua
+%patch37 -p1
+popd
+%ifarch loongarch64
+%patch38 -p1
+%endif
+%ifarch riscv64
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%if ! %{bootstrap}
+%patch44 -p1
+%endif
+%endif
+# Disable tests
+for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui \
+    eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \
+    eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \
+    rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do
+  sed -i -e '/<module>.*tests.*<\/module>/d' $pom/pom.xml
+done
+
+%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2
+%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module ./tests/org.eclipse.e4.tools.test eclipse.platform.ui.tools
+
 %pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
 %pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
 %pom_xpath_remove 'pom:configuration/pom:timestampProvider' eclipse-platform-parent
@ -235,8 +263,6 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/
 %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.console.ssh.tests rt.equinox.bundles
-%pom_disable_module bundles/org.eclipse.equinox.console.tests 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
@ -248,9 +274,7 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/
 %pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2
 %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 bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2
-%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2
 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2
 %pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core
 %pom_xpath_remove "plugin[@version='1.1.400.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
@ -265,12 +289,11 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclips
 %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles
-%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui
 %pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent
 rm -rf eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.{aarch64,s390x}
 rm -rf rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.{aarch64,s390x}
 for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do
-  utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x
+  utils/ensure_arch.sh "$dir" x86_64 aarch64 s390x loongarch64 riscv64
 done
 TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{_arch}</arch></environment>"
 %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent
@ -321,22 +344,18 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
  %pom_xpath_remove -f "plugin[@os='macosx']" $f
  %pom_xpath_remove -f "plugin[@os='win32']" $f
  %pom_xpath_remove -f "plugin[@ws='win32']" $f
-  for arch in x86 x86_64 arm aarch64 ppc64le s390x ; do
+  for arch in x86 x86_64 arm aarch64 ppc64le s390x riscv64; do
    if [ "$arch" != "%{_arch}" ] ; then
      %pom_xpath_remove -f "plugin[@arch='$arch']" $f
    fi
  done
 done
-%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt
 %pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests{,.gtk}
 %if %{bootstrap}
 %pom_disable_module eclipse.platform.ui.tools
+%endif
 %pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
 %pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
-%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng
-%pom_xpath_remove "plugin[@id='org.eclipse.releng.tests']" \
-  eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-%endif
 sed -i -e '/<features>/a<feature id="org.eclipse.core.runtime.feature"/>' \
  eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
 sed -i -e '/org.eclipse.ui.themes/i<plugin id="org.eclipse.jdt.core.compiler.batch" download-size="0" install-size="0" version="0.0.0" unpack="false"/>' \
@ -373,12 +392,7 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
 ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
 ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/
 %mvn_package "::pom::" __noinstall
-%mvn_package ":*tests*" tests
-%mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests
-%mvn_package ":org.eclipse.equinox.p2.installer" tests
-%mvn_package ":org.eclipse.jface.examples.databinding" tests
-%mvn_package ":org.eclipse.pde.tools.versioning" tests
-%mvn_package ":org.eclipse.update.core" tests
+%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools
 %mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools
 %mvn_package ":*examples*" __noinstall
 %mvn_package "::jar:sources{,-feature}:" sdk
@ -400,6 +414,7 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
 %mvn_package "org.eclipse.ui:org.eclipse.ui.{views.log,trace}" pde
 %mvn_package "org.eclipse.sdk{,.feature}:" sdk
 %mvn_package ":" __noinstall
+sed -i 's/-O -g -Wall -fPIC/-O -g -Wall -fPIC -pie -Wl,-z,relro -Wl,-z,now -fstack-protector-strong/g' eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library/build.sh

 %build
 export CFLAGS="%{optflags}"
@ -521,9 +536,9 @@ for J in $OSGI_JARS ; do
  VER=$(echo $JAR | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
  %mvn_artifact "org.eclipse.osgi:$J:jar:$VER" $JAR
  if [ "$J" = "osgi" ] ; then
-    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse:$J"
+    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J" "org.eclipse:$J"
  else
-    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J"
+    %mvn_alias "org.eclipse.osgi:$J" "org.eclipse.osgi:org.eclipse.$J" "org.eclipse.tycho:org.eclipse.$J" "org.eclipse.platform:org.eclipse.$J"
  fi
 done
 JAR=%{buildroot}%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_*.jar
@ -539,13 +554,7 @@ VER=$(echo $JAR | sed -e "s/.*_\(.*\)\.jar/\1/")
 pushd %{buildroot}/%{_eclipsedir}/
    ln -s $(abs2rel %{_jnidir}/swt.jar %{_eclipsedir})
 popd
-unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip \
-  -d $RPM_BUILD_ROOT/%{_datadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh
-cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing
-rm $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/eclipse-junit-tests-*.zip
-sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/equinoxp2tests.properties
-cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle
-mv $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
+
 find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \;
 install -d -m 755 %{buildroot}%{_eclipsedir}/.pkgs
 echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
@ -748,10 +757,6 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}

 %files contributor-tools -f .mfiles-contributor-tools

-%files tests -f .mfiles-tests
-%{_bindir}/eclipse-runTestBundles
-%{_datadir}/eclipse-testing
-
 %files equinox-osgi -f .mfiles-equinox-osgi
 %{_eclipsedir}/plugins/org.eclipse.osgi_*
 %{_eclipsedir}/plugins/org.eclipse.osgi.compatibility.state_*
@ -759,6 +764,24 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*

 %changelog
+* Wed Apr 24 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:4.11-11
+- Add support for riscv64
+- Disable org.eclipse.releng.tools for non-bootstrap
+
+* Wed Sep 27 2023 wangkai <13474090681@163.com> -  1:4.11-10
+- Disable tests for hamcrest-2.2
+- Drop tests sub-package
+
+* Wed Aug 09 2023 loongson <service@loongson.cn> - 1:4.11-9
+- Add Loongarch64 support
+
+* Tue Feb 21 2023 liyanan <liyanan32@h-partners.com> - 1:4.11-8
+- Add security compile options pie, relro and -fstack-protector-strong
+- Add glassfish-jsp and glassfish-servlet-api and glassfish-el-api version limit
+
+* Thu Jul 14 2022 wangkai <wangkai385@h-partners.com> - 1:4.11-7
+- Fix CVE-2020-27225
+
 * Tue Jun 21 2022 baizhonggui <baizhonggui@h-partners.com> - 1:4.11-6
 - fixed objectweb.asm version limit

--- a/explicit-hamcrest.patch
+++ b/explicit-hamcrest.patch
@ -1,19 +0,0 @@
--- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig	2018-08-20 12:54:25.245305107 +0100
-+++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF	2018-08-20 12:54:37.952261537 +0100
-@@ -33,6 +33,7 @@
-  org.eclipse.ui.workbench.texteditor;resolution:=optional,
-  org.eclipse.ui.editors;resolution:=optional,
-  org.junit,
-+ org.hamcrest.core,
-  org.eclipse.core.resources,
-  org.eclipse.core.variables,
-  org.eclipse.ui,
--- eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF.orig	2018-08-20 13:22:04.987695821 +0100
-+++ eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF	2018-08-20 13:22:28.507613518 +0100
-@@ -7,4 +7,5 @@
- Fragment-Host: org.eclipse.urischeme;bundle-version="1.0.0"
- Automatic-Module-Name: org.eclipse.urischeme.tests
- Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)"
-+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
-+ org.hamcrest.core;bundle-version="1.3.0"
--- a/riscv.patch
+++ b/riscv.patch
@ -0,0 +1,127 @@
+--- eclipse-platform-sources-I20190307-0500/eclipse.platform.swt.binaries/pom.xml	2022-06-13 09:02:04.367331800 +0800
+++ eclipse-platform-sources-I20190307-0500/eclipse.platform.swt.binaries/pom.xml	2022-06-13 09:03:20.532068500 +0800
+@@ -56,6 +56,7 @@
+     <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
+    <module>bundles/org.eclipse.swt.gtk.linux.riscv64</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
+--- eclipse-platform-sources-I20190307-0500/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2022-06-13 09:10:02.313013100 +0800
+++ eclipse-platform-sources-I20190307-0500/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2022-06-13 09:10:58.177096200 +0800
+@@ -43,4 +43,9 @@
+ requires.9.namespace = org.eclipse.equinox.p2.iu
+ requires.9.name = org.eclipse.swt.gtk.linux.x86
+ requires.9.range = [$version$,$version$]
+-requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
+
+requires.10.namespace = org.eclipse.equinox.p2.iu
+requires.10.name = org.eclipse.swt.gtk.linux.riscv64
+requires.10.range = [$version$,$version$]
+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=riscv64)(!(org.eclipse.swt.buildtime=true)))
+--- eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2019-03-07 11:00:05.000000000 +0800
+++ eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2022-06-10 14:56:59.849231400 +0800
+@@ -423,6 +423,16 @@
+          fragment="true"/>
+ 
+    <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.riscv64"
+         os="linux"
+         ws="gtk"
+         arch="riscv64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+          id="org.eclipse.equinox.launcher.win32.win32.x86_64"
+          os="win32"
+          ws="win32"
+@@ -469,6 +479,17 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.riscv64"
+         os="linux"
+         ws="gtk"
+         arch="riscv64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+ 
+--- eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2019-03-07 11:00:05.000000000 +0800
+++ eclipse-platform-sources-I20190307-0500/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2022-06-10 14:59:51.086049000 +0800
+@@ -44,6 +44,7 @@
+                 <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
+                 <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.riscv64" />
+                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
+                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" />
+                 <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
+--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2018-09-14 18:27:05.000000000 +0800
+++ eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2022-06-10 15:02:06.582577100 +0800
+@@ -39,6 +39,9 @@
+ root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+ root.linux.gtk.aarch64.permissions.755=launcher
+ 
+root.linux.gtk.riscv64=bin/gtk/linux/riscv64,gtk_root
+root.linux.gtk.riscv64.permissions.755=launcher
+
+ root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
+ root.linux.gtk.s390x.permissions.755=launcher
+ 
+--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2018-08-23 08:04:10.000000000 +0800
+++ eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2022-06-10 15:04:52.156916700 +0800
+@@ -121,6 +121,11 @@
+ 				defaultJava=DEFAULT_JAVA_EXEC
+ 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ 				;;
+			"riscv64")
+				defaultOSArch="riscv64"
+				defaultJava=DEFAULT_JAVA_EXEC
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+				;;
+ 			*)
+ 				echo "*** Unknown MODEL <${MODEL}>"
+ 				;;
+--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/pom.xml	2022-06-10 17:08:02.791754200 +0800
+++ eclipse-platform-sources-I20190307-0500/rt.equinox.framework/pom.xml	2022-06-10 17:09:14.079668300 +0800
+@@ -74,6 +74,18 @@
+       </modules>
+     </profile>
+     <profile>
+      <id>build-native-launchers-gtk.linux.riscv64</id>
+      <activation>
+	<property>
+	  <name>native</name>
+	  <value>gtk.linux.riscv64</value>
+        </property>
+      </activation>
+      <modules>
+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.riscv64</module>
+      </modules>
+    </profile>
+    <profile>
+       <id>build-native-launchers-gtk.linux.s390x</id>
+       <activation>
+ 	<property>
+--- eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2022-06-10 17:54:33.365416200 +0800
+++ eclipse-platform-sources-I20190307-0500/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2022-06-10 17:55:46.766618600 +0800
+@@ -134,6 +134,7 @@
+                         <include name="gtk/linux/x86/**/*"/>
+                         <include name="gtk/linux/x86_64/**/*"/>
+                         <include name="win32/win32/x86_64/**/*"/>
+                        <include name="gtk/linux/riscv64/**/*"/>
+                       </fileset>
+                     </copy>
+                     <!-- rename eclipse launchers to "launcher" -->
--- a/switch-to-the-new-httpclient45-ECF-provider_2.patch
+++ b/switch-to-the-new-httpclient45-ECF-provider_2.patch
@ -0,0 +1,36 @@
+From 412a5c1bbdae63f03212f9ad25ac71e54e222f4f Mon Sep 17 00:00:00 2001
+From: Mat Booth
+Date: Thu, 16 May 2019 16:49:38 +0100
+Subject: Bug 545718 - Update prereqs for 4.12 release: ECF
+
+Switch to the new httpclient45 ECF provider.
+
+Change-Id: I8b3b79d33fce0a7f4b688718c10d5e76b9169396
+Signed-off-by: Mat Booth <mat.booth@redhat.com>
+---
+ bundles/org.eclipse.platform.doc.isv/pom.xml | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+(limited to 'bundles/org.eclipse.platform.doc.isv/pom.xml')
+
+diff --git a/bundles/org.eclipse.platform.doc.isv/pom.xml b/bundles/org.eclipse.platform.doc.isv/pom.xml
+index 63638a05d..3d7d4761e 100644
+--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+@@ -163,12 +163,7 @@
+                   </requirement>
+                   <requirement>
+                     <type>eclipse-plugin</type>
+-                    <id>org.eclipse.ecf.provider.filetransfer.httpclient4</id>
+-                    <versionRange>0.0.0</versionRange>
+-                  </requirement>
+-                  <requirement>
+-                    <type>eclipse-plugin</type>
+-                    <id>org.eclipse.ecf.provider.filetransfer.httpclient4.ssl</id>
+                    <id>org.eclipse.ecf.provider.filetransfer.httpclient45</id>
+                     <versionRange>0.0.0</versionRange>
+                   </requirement>
+                   <requirement>
+-- 
+cgit v1.2.3
+
Author	SHA1	Message	Date
openeuler-ci-bot	455e958cb4	!41 Add support for riscv64 and disable org.eclipse.releng.tools for non-bootstrap From: @DingliZhang Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2024-04-29 09:26:50 +00:00
Dingli Zhang	61e34eb12a	Add support for riscv64 and disable org.eclipse.releng.tools for non-bootstrap	2024-04-27 14:14:15 +08:00
openeuler-ci-bot	2a467d7a7b	!39 Disable tests for hamcrest-2.2 and Drop tests sub-package From: @wk333 Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2023-10-07 09:24:00 +00:00
wk333	c4c360f843	Disable tests for hamcrest-2.2 and Drop tests sub-package	2023-09-28 15:35:09 +08:00
openeuler-ci-bot	0045422834	!38 Add Loongarch64 support From: @lsfyl Reviewed-by: @cherry530 Signed-off-by: @cherry530	2023-08-15 08:57:08 +00:00
YalingFang	4d8fd62138	Add Loongarch64 support	2023-08-09 15:49:26 +08:00
openeuler-ci-bot	c85617c4ee	!34 Sync 22.09 branch for fix build error From: @lyn1001 Reviewed-by: @cherry530 Signed-off-by: @cherry530	2023-02-21 11:45:54 +00:00
lyn1001	2dbe594c73	Sync 22.09 branch for fix build error	2023-02-21 11:19:51 +08:00
openeuler-ci-bot	9b27f22917	!25 Fix CVE-2020-27225 From: @wk333 Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924	2022-07-15 01:21:18 +00:00
wk333	13963bd117	Fix CVE-2020-27225	2022-07-14 16:28:23 +08:00