java/eclipse: Update to 4.24

PR:		264864

16 files changed, 321 insertions, 840 deletions

diff --git a/java/eclipse/files/cef-patch b/java/eclipse/files/cef-patch
deleted file mode 100644
index 7ffd86d8053d..000000000000
--- a/java/eclipse/files/cef-patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/cmake/cef_variables.cmake ./cmake/cef_variables.cmake
---- ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/cmake/cef_variables.cmake	2017-07-19 17:50:42.000000000 +1200
-+++ ./cmake/cef_variables.cmake	2020-10-02 14:38:13.438964000 +1300
-@@ -16,7 +16,7 @@
- if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-   set(OS_MACOSX 1)
-   set(OS_POSIX 1)
--elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
-   set(OS_LINUX 1)
-   set(OS_POSIX 1)
- elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-diff -ruN ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/include/base/cef_build.h ./include/base/cef_build.h
---- ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/include/base/cef_build.h	2017-07-19 17:50:42.000000000 +1200
-+++ ./include/base/cef_build.h	2020-10-02 14:43:29.023692000 +1300
-@@ -47,7 +47,7 @@
- #ifndef OS_MACOSX
- #define OS_MACOSX 1
- #endif
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__)
- #ifndef OS_LINUX
- #define OS_LINUX 1
- #endif
diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in
index 756e4a5fbd8f..491694fe88fe 100644
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -7,6 +7,8 @@
 
 # Create required Webkit communication directories removed by:
 # https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/163641/
+# The changeset makes use of dbus "abstract" socket feature which is
+# only available on Linux.
 for D in SWT-GDBusServer SWT-WebExtensionGDBusServer
 do
 	mkdir -p /tmp/${D}
diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent
index be14b1964bd7..ee6b0852f552 100644
--- a/java/eclipse/files/patch-eclipse-platform-parent
+++ b/java/eclipse/files/patch-eclipse-platform-parent
@@ -1,19 +1,19 @@
 diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
 --- eclipse-platform-parent/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse-platform-parent/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -81,9 +81,9 @@
+@@ -77,9 +77,9 @@
        'eclipiserun-repo' repository, such as for computing .api-descriptions and
        generating API Tools reports.
      -->
--    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.21-I-builds/</eclipserun-repo>
-+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.21/</eclipserun-repo>
+-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.24-I-builds/</eclipserun-repo>
++    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.24/</eclipserun-repo>
      
--    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.21-I-builds</comparator.repo>
-+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.21</comparator.repo>
+-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.24-I-builds</comparator.repo>
++    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.24</comparator.repo>
  
      <!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
      <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
-@@ -257,17 +257,22 @@
+@@ -253,17 +253,22 @@
            </target>
            <environments>
              <environment>
@@ -41,12 +41,12 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
                <ws>gtk</ws>
                <arch>aarch64</arch>
              </environment>
-@@ -624,7 +629,7 @@
+@@ -625,7 +630,7 @@
            For maintenance streams should always be "M-builds".
            Ideally, this value would be provided by the environment, see bug 489789.
          -->
--        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.21-I-builds</eclipse-p2-repo.url>
-+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.21</eclipse-p2-repo.url>
+-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.24-I-builds</eclipse-p2-repo.url>
++        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.24</eclipse-p2-repo.url>
        </properties>
        <repositories>
          <repository>
diff --git a/java/eclipse/files/patch-eclipse.pde b/java/eclipse/files/patch-eclipse.pde
new file mode 100644
index 000000000000..714dc2717561
--- /dev/null
+++ b/java/eclipse/files/patch-eclipse.pde
@@ -0,0 +1,146 @@
+diff -ru eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml
+--- eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -59,10 +59,10 @@
+ 		</ant>
+  	</target>
+ 	
+-	<property name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64" value="true" />
+- 	<target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64">
++	<property name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64" value="true" />
++ 	<target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64">
+  		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
+- 			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
++ 			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
+ 		</ant>
+  	</target>
+ 	
+diff -ru eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
+--- eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java	0000-00-00 00:00:00.000000000 +0000
+@@ -694,7 +694,7 @@
+ 			arguments.add("-sf"); //$NON-NLS-1$
+ 			arguments.add(links[i]);
+ 			arguments.add(links[i + 1]);
+-			script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
++			script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$
+ 			arguments.clear();
+ 		}
+ 	}
+diff -ru eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
+--- eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java	0000-00-00 00:00:00.000000000 +0000
+@@ -912,7 +912,7 @@
+ 		for (int i = 0; i < links.length; i += 2) {
+ 			arguments.add(links[i]);
+ 			arguments.add(links[i + 1]);
+-			script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
++			script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$
+ 			arguments.clear();
+ 		}
+ 	}
+diff -ru eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java
+--- eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java	0000-00-00 00:00:00.000000000 +0000
+@@ -308,8 +308,8 @@
+ 			return "Windows"; //$NON-NLS-1$
+ 		if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$
+ 			return "Mac"; //$NON-NLS-1$
+-		if ("linux".equalsIgnoreCase(os)) //$NON-NLS-1$
+-			return "Linux"; //$NON-NLS-1$
++		if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$
++			return "FreeBSD"; //$NON-NLS-1$
+ 		if ("solaris".equalsIgnoreCase(os)) //$NON-NLS-1$
+ 			return "Solaris"; //$NON-NLS-1$
+ 		if ("hpux".equalsIgnoreCase(os)) //$NON-NLS-1$
+diff -ru eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml
+--- eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -19,9 +19,9 @@
+ 		</ant>
+ 	</target>
+ 	
+-	<target name="assemble.linux.gtk.x86_64.xml">
++	<target name="assemble.freebsd.gtk.amd64.xml">
+ 		<ant antfile="${assembleScriptName}" >
+-			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
++			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
+ 		</ant>
+ 	</target>
+ 		
+diff -ru eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties
+--- eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties	0000-00-00 00:00:00.000000000 +0000
+@@ -19,4 +19,4 @@
+ root.permissions.755=eclipse,*.so*
+ 
+ root.win32.win32.x86_64=eclipse.exe, eclipsec.exe
+-root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
++root.freebsd.gtk.amd64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
+diff -ru eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java
+--- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java	0000-00-00 00:00:00.000000000 +0000
+@@ -56,8 +56,8 @@
+ 	private FormEntry fCustomEntry;
+ 	private boolean fBlockChanges;
+ 
+-	private static final String[] TAB_LABELS = { "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+-	private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
++	private static final String[] TAB_LABELS = { "freebsd", "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
++	private static final String[] TAB_OS = { Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
+ 
+ 	private CTabFolder fTabFolder;
+ 	private int fLastTab;
+diff -ru eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java
+--- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java	0000-00-00 00:00:00.000000000 +0000
+@@ -69,8 +69,8 @@
+ 	private ComboViewerPart fEEsCombo;
+ 	private boolean fBlockChanges;
+ 
+-	private static final String[] TAB_LABELS = { "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+-	private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
++	private static final String[] TAB_LABELS = { "freebsd", "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
++	private static final String[] TAB_OS = { Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
+ 
+ 	private CTabFolder fTabFolder;
+ 	private int fLastTab;
+diff -ru eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java
+--- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java	0000-00-00 00:00:00.000000000 +0000
+@@ -130,7 +130,7 @@
+ 		implementation.setName("implementation"); //$NON-NLS-1$
+ 		implementation.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$
+ 		implementation.setAttribute("style", "content/shared.css"); //$NON-NLS-1$ //$NON-NLS-2$
+-		implementation.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
++		implementation.setAttribute("os", "freebsd,win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
+ 
+ 		presentation.add(implementation);
+ 
+diff -ru eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
+--- eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java	0000-00-00 00:00:00.000000000 +0000
+@@ -162,7 +162,7 @@
+ 		presentationElement.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$
+ 		IPluginElement implementationElement = factory.createElement(presentationElement);
+ 		implementationElement.setName("implementation"); //$NON-NLS-1$
+-		implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
++		implementationElement.setAttribute("os", "freebsd,win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
+ 		if (getTargetVersion() == 3.0)
+ 			implementationElement.setAttribute("style", "content/shared.css"); //$NON-NLS-1$//$NON-NLS-2$
+ 
+diff -ru eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product
+--- eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
+@@ -84,8 +84,9 @@
+       <plugin id="org.osgi.util.promise"/>
+       <plugin id="org.eclipse.swt"/>
+       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
+-      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
+-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
++      <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64" fragment="true"/>
++      <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64le" fragment="true"/>
++      <plugin id="org.eclipse.swt.gtk.freebsd.amd64" fragment="true"/>
+       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+       <plugin id="org.eclipse.urischeme"/>
+       <plugin id="org.w3c.css.sac"/>
diff --git a/java/eclipse/files/patch-eclipse.pde.build b/java/eclipse/files/patch-eclipse.pde.build
deleted file mode 100644
index 212fdd5a956a..000000000000
--- a/java/eclipse/files/patch-eclipse.pde.build
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ru eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml
---- eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -59,10 +59,10 @@
- 		</ant>
-  	</target>
- 	
--	<property name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64" value="true" />
-- 	<target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64">
-+	<property name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64" value="true" />
-+ 	<target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64">
-  		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
-- 			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
-+ 			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
- 		</ant>
-  	</target>
- 	
-diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
---- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java	0000-00-00 00:00:00.000000000 +0000
-@@ -694,7 +694,7 @@
- 			arguments.add("-sf"); //$NON-NLS-1$
- 			arguments.add(links[i]);
- 			arguments.add(links[i + 1]);
--			script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
-+			script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$
- 			arguments.clear();
- 		}
- 	}
-diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
---- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java	0000-00-00 00:00:00.000000000 +0000
-@@ -912,7 +912,7 @@
- 		for (int i = 0; i < links.length; i += 2) {
- 			arguments.add(links[i]);
- 			arguments.add(links[i + 1]);
--			script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
-+			script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$
- 			arguments.clear();
- 		}
- 	}
-diff -ru eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java
---- eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java	0000-00-00 00:00:00.000000000 +0000
-@@ -306,6 +306,8 @@
- 	private String convertOS(String os) {
- 		if (os == null)
- 			return null;
-+		if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$
-+			return "FreeBSD"; //$NON-NLS-1$
- 		if ("win32".equalsIgnoreCase(os)) //$NON-NLS-1$
- 			return "Windows"; //$NON-NLS-1$
- 		if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$
diff --git a/java/eclipse/files/patch-eclipse.pde.ui b/java/eclipse/files/patch-eclipse.pde.ui
deleted file mode 100644
index 9a9ec2111d40..000000000000
--- a/java/eclipse/files/patch-eclipse.pde.ui
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product
---- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
-@@ -82,8 +82,9 @@
-       <plugin id="org.eclipse.osgi.util"/>
-       <plugin id="org.eclipse.swt"/>
-       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
--      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
--      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-+      <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64" fragment="true"/>
-+      <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64le" fragment="true"/>
-+      <plugin id="org.eclipse.swt.gtk.freebsd.amd64" fragment="true"/>
-       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
-       <plugin id="org.eclipse.urischeme"/>
-       <plugin id="org.w3c.css.sac"/>
diff --git a/java/eclipse/files/patch-eclipse.platform.releng b/java/eclipse/files/patch-eclipse.platform.releng
index 99d130993e82..71456e76cf08 100644
--- a/java/eclipse/files/patch-eclipse.platform.releng
+++ b/java/eclipse/files/patch-eclipse.platform.releng
@@ -12,20 +12,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -105,9 +105,9 @@
-          unpack="false"/>
-    
-    <plugin
--         id="org.eclipse.core.net.linux.x86_64"
--         os="linux"
--         arch="x86_64"
-+         id="org.eclipse.core.net.freebsd.amd64"
-+         os="freebsd"
-+         arch="amd64"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-@@ -371,9 +371,9 @@
+@@ -363,9 +363,9 @@
           unpack="false"/>
  
     <plugin
@@ -38,7 +25,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -410,18 +410,28 @@
+@@ -402,18 +402,27 @@
           unpack="false"/>
  
     <plugin
@@ -53,7 +40,6 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           version="0.0.0"
           fragment="true"
           unpack="false"/>
-+
 +   <plugin
 +         id="org.eclipse.core.filesystem.freebsd.powerpc64le"
 +         os="freebsd"
@@ -63,7 +49,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-          
+ 
     <plugin
 -         id="org.eclipse.core.filesystem.linux.aarch64"
 -         os="linux"
@@ -72,7 +58,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           arch="aarch64"
           download-size="0"
           install-size="0"
-@@ -484,8 +494,8 @@
+@@ -476,8 +485,8 @@
           unpack="false"/>
  
     <plugin
@@ -83,19 +69,6 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -493,9 +503,9 @@
-          unpack="false"/>
-    
-    <plugin
--         id="org.eclipse.equinox.security.linux.x86_64"
--         os="linux"
--         arch="x86_64"
-+         id="org.eclipse.equinox.security.freebsd.amd64"
-+         os="freebsd"
-+         arch="amd64"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
 diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
 --- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
index c06c267fd507..b38bf896ea1e 100644
--- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
+++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
@@ -1,7 +1,7 @@
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -8,16 +8,20 @@
+@@ -15,16 +15,20 @@
          fileName="eclipse-SDK-${BUILD_ID}-win32-x86_64.zip"></platform>
        <platform
          id="SLG264"
@@ -28,7 +28,7 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/tes
        <platform
          id="SMCC64"
          name="Mac OSX (64 bit version)"
-@@ -71,16 +75,16 @@
+@@ -64,16 +68,16 @@
          fileName="eclipse-platform-${BUILD_ID}-win32-x86_64.zip"></platform>
        <platform
          id="PLG264"
@@ -51,7 +51,7 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/tes
        <platform
          id="PMCC64"
          name="Mac OSX (64 bit version)"
-@@ -113,16 +117,16 @@
+@@ -106,16 +110,16 @@
          fileName="swt-${BUILD_ID}-win32-win32-x86_64.zip"></platform>
        <platform
          id="SWTLG64"
@@ -116,7 +116,7 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -117,9 +117,11 @@
+@@ -124,9 +124,11 @@
            <execution>
              <id>mirror-build</id>
              <phase>generate-resources</phase>
@@ -128,7 +128,7 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository
              <configuration>
                <source>
                  <!-- source repositories to mirror from -->
-@@ -402,7 +404,7 @@
+@@ -392,7 +394,7 @@
              <configuration>
                <formats>
                  <win32>zip</win32>
@@ -238,7 +238,7 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.re
 +-->
      <module>eclipse.platform.repository</module>
    </modules>
- </project>
+ 
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
 --- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
diff --git a/java/eclipse/files/patch-eclipse.platform.resources b/java/eclipse/files/patch-eclipse.platform.resources
index 0cc9c1752db8..b295843976a2 100644
--- a/java/eclipse/files/patch-eclipse.platform.resources
+++ b/java/eclipse/files/patch-eclipse.platform.resources
@@ -57,16 +57,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
+     <version>4.24.0-SNAPSHOT</version>
      <relativePath>../../</relativePath>
    </parent>
-   <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.filesystem.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.core.filesystem.freebsd.aarch64</artifactId>
    <version>1.4.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
@@ -114,16 +114,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
+     <version>4.24.0-SNAPSHOT</version>
      <relativePath>../../</relativePath>
    </parent>
-   <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.core.filesystem.freebsd.amd64</artifactId>
    <version>1.2.300-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -33,9 +33,9 @@
+@@ -32,9 +32,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
@@ -135,7 +135,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
              </environment>
            </environments>
          </configuration>
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
@@ -144,7 +144,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
          </property>
        </activation>
        <build>
-@@ -63,10 +63,10 @@
+@@ -62,10 +62,10 @@
                  <phase>process-resources</phase>
                  <configuration>
                    <target>
@@ -198,16 +198,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
+     <version>4.24.0-SNAPSHOT</version>
      <relativePath>../../</relativePath>
    </parent>
-   <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.filesystem.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.core.filesystem.freebsd.powerpc64</artifactId>
    <version>1.4.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -37,9 +37,9 @@
+@@ -36,9 +36,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
@@ -258,16 +258,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
+     <version>4.24.0-SNAPSHOT</version>
      <relativePath>../../</relativePath>
    </parent>
-   <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.filesystem.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.core.filesystem.freebsd.powerpc64le</artifactId>
    <version>1.4.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -37,9 +37,9 @@
+@@ -36,9 +36,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt
index ed7904588c77..dc00b69720aa 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt
+++ b/java/eclipse/files/patch-eclipse.platform.swt
@@ -36,7 +36,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/ecli
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	0000-00-00 00:00:00.000000000 +0000
-@@ -65,12 +65,12 @@
+@@ -63,12 +63,12 @@
  
  static String arch() {
  	String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
@@ -115,53 +115,32 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
  	"linux.x86_64")
  		if [ "${CC}" = "" ]; then
  			export CC=gcc
-@@ -148,7 +158,7 @@
+@@ -159,7 +169,7 @@
  
  
  # For 64-bit CPUs, we have a switch
--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
-+if [ ${MODEL} = 'amd64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'aarch64' ]; then
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ]; then
++if [ ${MODEL} = 'amd64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ]; then
  	SWT_PTR_CFLAGS=-DJNI64
  	if [ -d /lib64 ]; then
  		XLIB64=-L/usr/X11R6/lib64
-@@ -160,6 +170,11 @@
+@@ -170,6 +180,11 @@
+ 		XLIB64="${XLIB64} -L/usr/lib64"
  		SWT_LFLAGS=-m64
  		export SWT_LFLAGS
- 	fi
++	fi
 +	if [ ${SWT_OS} = "freebsd" ]
 +	then
 +		SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
 +		export SWT_LFLAGS=-m64
-+	fi
+ 	fi
  	export SWT_PTR_CFLAGS
  fi
- 
-@@ -275,10 +290,10 @@
- 
- func_build_chromium () {
- 	func_echo_plus "Building Chromium bindings:"
--	if [ -d "chromium_subp/cef_linux" ]; then
--		export CHROMIUM_HEADERS=./chromium_subp/cef_linux
-+	if [ -d "chromium_subp/cef_freebsd" ]; then
-+		export CHROMIUM_HEADERS=./chromium_subp/cef_freebsd
- 	else
--		export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_linux
-+		export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_freebsd
- 	fi
- 	${MAKE_TYPE} -f $MAKEFILE "${@}"
- 	RETURN_VALUE=$?   #make can return 1 or 2 if it fails. Thus need to cache it in case it's used programmatically somewhere.
-@@ -332,4 +347,4 @@
- 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 -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
-@@ -113,16 +113,18 @@
- CHROMIUM_OBJECTS = chromiumlib.o chromiumlib_structs.o chromiumlib_custom.o chromiumlib_stats.o
+@@ -98,16 +98,18 @@
+ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
 +port_prefix=`pkg-config --variable=prefix gtk+-3.0`
@@ -182,17 +161,6 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
  
  # Treat all warnings as errors. If your new code produces a warning, please
  # take time to properly understand and fix/silence it as necessary.
-@@ -303,10 +305,6 @@
- 	cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
- ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
- 	@# Copy webextension into it's own folder, but create folder first.
--	@# CAREFULLY delete '.so' files inside webextension*. Then carefully remove the directories. 'rm -rf' seemed too risky of an approach.
--	@-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so)" ] && rm -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so`
--	@-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*)" ] && rmdir -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*`
--
- 	@# Copying webextension is not critical for build to succeed, thus we use '-'. SWT can still function without a webextension.
- 	@-[ -d $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) ] || mkdir -v $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)  # If folder does not exist, make it.
- 	-cp $(WEBKIT_EXTENSION_LIB) $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)/
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
@@ -210,7 +178,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
-@@ -121,7 +121,7 @@
+@@ -114,7 +114,7 @@
  	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
  	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
  	 */
@@ -251,34 +219,34 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.pl
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
 --- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -68,17 +68,21 @@
+@@ -67,17 +67,21 @@
  		</antcall>
  		<antcall target="check_fragment_libraries">
- 			<param name="library_count" value="8"/>
+ 			<param name="library_count" value="7"/>
 -			<param name="fragment" value="org.eclipse.swt.gtk.linux.aarch64"/>
 +			<param name="fragment" value="org.eclipse.swt.gtk.freebsd.aarch64"/>
  		</antcall>
  		<antcall target="check_fragment_libraries">
- 			<param name="library_count" value="8"/>
+ 			<param name="library_count" value="7"/>
 -			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/>
 +			<param name="fragment" value="org.eclipse.swt.gtk.freebsd.powerpc64"/>
  		</antcall>
  		<antcall target="check_fragment_libraries">
- 			<param name="library_count" value="8"/>
+ 			<param name="library_count" value="7"/>
 -			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
 +			<param name="fragment" value="org.eclipse.swt.gtk.freebsd.powerpc64le"/>
  		</antcall>
  		<antcall target="check_fragment_libraries">
-+			<param name="library_count" value="8"/>
++			<param name="library_count" value="7"/>
 +			<param name="fragment" value="org.eclipse.swt.gtk.freebsd.amd64"/>
 +		</antcall>
 +		<antcall target="check_fragment_libraries">
  			<param name="library_count" value="4"/>
  			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
  		</antcall>
-@@ -89,13 +93,13 @@
+@@ -88,13 +92,13 @@
  		<property name="checkdir" value="~/build/check_libraries"/>
- 		<property name="library_count" value="34"/>
+ 		<property name="library_count" value="31"/>
  		<property name="fragment" value=""/>
 -		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/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.aarch64/**, **/org.eclipse.swt.cocoa.macosx.x86_64/**">
 +		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.aarch64/**, **/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.powerpc64le/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.aarch64/**, **/org.eclipse.swt.cocoa.macosx.x86_64/**">
@@ -292,303 +260,10 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platf
  			<filename regex="[0-9][0-9][0-9][0-9]"/>
  			<filename regex="${swt_version}" negate="true"/>
  			<exclude name="**/.git/**"/>
-@@ -372,7 +376,7 @@
- 		<replace file="${repo.src}/${file_make_common}" token="rev=${rev}" value="rev=${new_rev}"/>
- 		<replace file="${repo.src}/${file_make_common}" token="comma_ver=${comma_ver}" value="comma_ver=${new_comma_ver}"/>
- 		<replace file="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml" token="${swt_version}" value="${new_version}"/>
--		<replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/>
-+		<replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/>
- 		<replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/>
- 		<replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.win32.win32.x86_64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/>
- 	</target>
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-@@ -5,6 +5,6 @@
- Bundle-SymbolicName: org.eclipse.swt.browser.chromium;singleton:=true
- Bundle-Version: 3.116.0.qualifier
- Bundle-ManifestVersion: 2
--Eclipse-PlatformFilter: (osgi.arch=x86_64)
--SWT-Arch: x86_64
-+Eclipse-PlatformFilter: (osgi.arch=amd64)
-+SWT-Arch: amd64
- Automatic-Module-Name: org.eclipse.swt.browser.chromium
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
-@@ -10,6 +10,6 @@
- requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
- 
- requires.3.namespace = org.eclipse.equinox.p2.iu
--requires.3.name = org.eclipse.swt.browser.chromium.gtk.linux.x86_64
-+requires.3.name = org.eclipse.swt.browser.chromium.gtk.freebsd.amd64
- requires.3.range = [$version$,$version$]
--requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
-+requires.3.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=amd64)(!(org.eclipse.swt.buildtime=true)))
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -36,12 +36,10 @@
- 		<condition property="cefos" value="windows" else="${swt.os}">
- 			<equals arg1="${swt.os}" arg2="win32"/>
- 		</condition>
--		<property name="ceffile" value="cef_binary_3.3071.1649.g98725e6_${cefos}64_minimal.tar.bz2"/>
--		<mkdir dir="${tmphome}"/>
--		<get src="https://cef-builds.spotifycdn.com/${ceffile}" dest="${tmphome}/${ceffile}" usetimestamp="true"/>
--		<untar dest="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_${swt.os}" overwrite="false" compression="bzip2" src="${tmphome}/${ceffile}">
--			<cutdirsmapper dirs="1"/>
--		</untar>
-+		<copy todir="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_${swt.os}" overwrite="true">
-+			<fileset dir="${local.cefsource}"/>
-+		</copy>
-+		<patch patchfile="${local.patchfiles}/cef-patch" dir="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_${swt.os}"/>
- 	</target>
- 	
- 	<target name="build_chromium" depends="init_fragment,get_version,get_cef">
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs	0000-00-00 00:00:00.000000000 +0000
-@@ -38,8 +38,8 @@
-   if cfg!(target_os = "macos") {
-     cef_path.push("cef_macosx");
-   } 
--  else if cfg!(target_os = "linux") {
--    cef_path.push("cef_linux");
-+  else if cfg!(target_os = "freebsd") {
-+    cef_path.push("cef_freebsd");
-   } 
-   else if cfg!(target_os = "windows") {
-     if std::env::var("CARGO_CFG_TARGET_ARCH").unwrap() == "x86" {
-@@ -58,11 +58,12 @@
-     panic!("cargo:warning=Extract and rename cef binary (minimal) distro to {:?}", cef_path);
-   }
- 
--  if cfg!(target_os = "linux") {
-+  if cfg!(target_os = "freebsd") {
-     // println!("cargo:rustc-link-lib=gtk-x11-2.0");
-     // println!("cargo:rustc-link-lib=gdk-x11-2.0");
-     // println!("cargo:rustc-link-lib=gtk-3.so.0");
-     println!("cargo:rustc-link-lib=X11");
-+    println!("cargo:rustc-link-search=/usr/local/lib");
-   }
- 
-   // Tell cargo to tell rustc to link the system shared library.
-@@ -97,14 +98,14 @@
- }
- 
- #[cfg(feature = "gen")]
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- fn gen_os(cef_path: std::path::Display) {
-   let _ = generator(cef_path)
-     .header("cef_linux.h")
-     .whitelist_type("_cef_main_args_t")
-     .whitelist_type("_cef_window_info_t")
-     .whitelist_function("cef_get_xdisplay")
--    .generate().expect("Failed to gencef linux")
-+    .generate().expect("Failed to gencef freebsd")
-     .write_to_file(std::path::Path::new("src").join("cef").join("linux.rs"));
- }
- 
-@@ -126,7 +127,7 @@
- fn gen_cef(cef_path: std::path::Display) {
-   use std::io::Write;
-   #[cfg(target_os = "windows")] let gen = generator(cef_path).header("include/internal/cef_types_win.h");
--  #[cfg(target_os = "linux")] let gen = generator(cef_path).header("include/internal/cef_types_linux.h");
-+  #[cfg(target_os = "freebsd")] let gen = generator(cef_path).header("include/internal/cef_types_linux.h");
-   #[cfg(target_os = "macos")] let gen = generator(cef_path).header("include/internal/cef_types_mac.h");
-   let generated = gen
-     .header("cef.h")
-@@ -166,14 +167,14 @@
-     .blacklist_type(".*XDisplay")
-     .blacklist_type("VisualID")
-     .blacklist_type(".*XEvent")
--    .raw_line("#[cfg(target_os = \"linux\")] pub mod linux;")
--    .raw_line("#[cfg(target_os = \"linux\")] pub use self::linux::_cef_window_info_t;")
--    .raw_line("#[cfg(target_os = \"linux\")] pub use self::linux::_cef_main_args_t;")
--    .raw_line("#[cfg(target_os = \"linux\")] pub type wchar_t = i32;")
--    .raw_line("#[cfg(target_os = \"linux\")] pub type char16 = i32;")
--    .raw_line("#[cfg(target_os = \"linux\")] pub type time_t = isize;")
--    .raw_line("#[cfg(target_os = \"linux\")] pub type int64 = ::std::os::raw::c_longlong;")
--    .raw_line("#[cfg(target_os = \"linux\")] pub type uint64 = ::std::os::raw::c_ulonglong;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub mod linux;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub use self::linux::_cef_window_info_t;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub use self::linux::_cef_main_args_t;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub type wchar_t = i32;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub type char16 = i32;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub type time_t = isize;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub type int64 = ::std::os::raw::c_longlong;")
-+    .raw_line("#[cfg(target_os = \"freebsd\")] pub type uint64 = ::std::os::raw::c_ulonglong;")
-     .raw_line("#[cfg(target_os = \"macos\")] pub mod mac;")
-     .raw_line("#[cfg(target_os = \"macos\")] pub use self::mac::_cef_window_info_t;")
-     .raw_line("#[cfg(target_os = \"macos\")] pub use self::mac::_cef_main_args_t;")
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs	0000-00-00 00:00:00.000000000 +0000
-@@ -16,14 +16,14 @@
- #![allow(non_snake_case)]
- #![allow(non_camel_case_types)]
- #![allow(non_upper_case_globals)]
--#[cfg(target_os = "linux")] pub mod linux;
--#[cfg(target_os = "linux")] pub use self::linux::_cef_window_info_t;
--#[cfg(target_os = "linux")] pub use self::linux::_cef_main_args_t;
--#[cfg(target_os = "linux")] pub type wchar_t = i32;
--#[cfg(target_os = "linux")] pub type char16 = i32;
--#[cfg(target_os = "linux")] pub type time_t = isize;
--#[cfg(target_os = "linux")] pub type int64 = ::std::os::raw::c_longlong;
--#[cfg(target_os = "linux")] pub type uint64 = ::std::os::raw::c_ulonglong;
-+#[cfg(target_os = "freebsd")] pub mod linux;
-+#[cfg(target_os = "freebsd")] pub use self::linux::_cef_window_info_t;
-+#[cfg(target_os = "freebsd")] pub use self::linux::_cef_main_args_t;
-+#[cfg(target_os = "freebsd")] pub type wchar_t = i32;
-+#[cfg(target_os = "freebsd")] pub type char16 = i32;
-+#[cfg(target_os = "freebsd")] pub type time_t = isize;
-+#[cfg(target_os = "freebsd")] pub type int64 = ::std::os::raw::c_longlong;
-+#[cfg(target_os = "freebsd")] pub type uint64 = ::std::os::raw::c_ulonglong;
- #[cfg(target_os = "macos")] pub mod mac;
- #[cfg(target_os = "macos")] pub use self::mac::_cef_window_info_t;
- #[cfg(target_os = "macos")] pub use self::mac::_cef_main_args_t;
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml	0000-00-00 00:00:00.000000000 +0000
-@@ -15,7 +15,7 @@
- [dependencies]

- chromium = { path = "../chromium_subp/" }

- 

--[target.'cfg(target_os = "linux")'.dependencies]

-+[target.'cfg(target_os = "freebsd")'.dependencies]

- x11 = "2.17.0"

- 

- [target.'cfg(unix)'.dependencies]

-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs	0000-00-00 00:00:00.000000000 +0000
-@@ -12,7 +12,7 @@
-  ********************************************************************************/
- use cef;
- use utils;
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- use gtk;
- 
- use std::os::raw::{c_int, c_void};
-@@ -76,7 +76,7 @@
-     browser
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- fn override_system_visual(visual: *mut c_void) {
-     unsafe {
-         let xvisual = gtk::gdk_x11_visual_get_xvisual(visual);
-@@ -85,12 +85,12 @@
-     }
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- extern "C" {
-     pub fn cef_override_system_visual(visual_id: std::os::raw::c_ulong);
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- fn cef_window_info(hwnd: *mut c_void, w: c_int, h: c_int) -> cef::_cef_window_info_t {
-     use std::os::raw::c_uint;
-     let window_info = unsafe {
-@@ -112,7 +112,7 @@
-     window_info
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- pub fn set_window_parent(window_info: *mut cef::_cef_window_info_t, hwnd: *mut c_void, x: c_int, y: c_int, w: c_int, h: c_int) {
-     use std::os::raw::c_uint;
-     //unsafe {println!("orig window_info {} {:?}", hwnd, (*window_info)); };
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs
---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs	0000-00-00 00:00:00.000000000 +0000
-@@ -12,7 +12,7 @@
-  ********************************************************************************/
- extern crate chromium;
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- extern crate x11;
- #[cfg(unix)]
- extern crate nix;
-@@ -25,21 +25,21 @@
- use chromium::socket;
- 
- mod app;
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- mod gtk;
- 
- use std::os::raw::{c_char, c_int, c_void};
- #[cfg(unix)]
- use std::collections::HashMap;
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- unsafe extern fn xerror_handler_impl(_: *mut x11::xlib::Display, _event: *mut x11::xlib::XErrorEvent) -> c_int {
-     //print!("X error received: ");
-     //println!("type {}, serial {}, error_code {}, request_code {}, minor_code {}",
-     //    (*event).type_, (*event).serial, (*event).error_code, (*event).request_code, (*event).minor_code);
-     0
- }
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- unsafe extern fn xioerror_handler_impl(_: *mut x11::xlib::Display) -> c_int {
-     //println!("XUI error received");
-     0
-@@ -67,7 +67,7 @@
-         if cfg!(target_family = "windows") {
-             set_env_var(cef_path, "PATH", ";");
-         }
--        if cfg!(target_os = "linux") {
-+        if cfg!(target_os = "freebsd") {
-             set_env_var(cef_path, "LD_LIBRARY_PATH", ":");
-         }
-         if cfg!(target_os = "macos") {
-@@ -146,7 +146,7 @@
-     };
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- fn do_initialize(main_args: cef::_cef_main_args_t, settings: cef::_cef_settings_t, app_raw: *mut cef::_cef_app_t) {
-     unsafe { x11::xlib::XSetErrorHandler(Option::Some(xerror_handler_impl)) };
-     unsafe { x11::xlib::XSetIOErrorHandler(Option::Some(xioerror_handler_impl)) };
-@@ -366,7 +366,7 @@
-     do_resize(win_handle, width, height);
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- fn do_resize(win_handle: *mut c_void, width: i32, height: i32) {
-     use x11::xlib;
- 
-@@ -642,7 +642,7 @@
-     }
- }
- 
--#[cfg(target_os = "linux")]
-+#[cfg(target_os = "freebsd")]
- fn do_set_focus(parent: *mut c_void, _focus: i32) {
-     let root = unsafe { gtk::gtk_widget_get_toplevel(parent) };
-     //println!("<<<<<<<< set_focus {} {:?} {:?}", focus, parent, root);
-@@ -768,4 +768,4 @@
- #[no_mangle]
- pub extern fn cefswt_go_back(browser: *mut cef::_cef_browser_t) {
-     unsafe { (*browser).go_back.expect("null go_back")(browser) };
--}
-\ No newline at end of file
-+}
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
 --- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup	0000-00-00 00:00:00.000000000 +0000
-@@ -108,7 +108,7 @@
+@@ -91,7 +91,7 @@
                xsi:type="predicates:NotPredicate">
              <operand
                  xsi:type="predicates:NamePredicate"
@@ -629,7 +304,7 @@ diff -ru eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/M
 diff -ru eclipse.platform.swt/pom.xml eclipse.platform.swt/pom.xml
 --- eclipse.platform.swt/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -85,11 +85,12 @@
+@@ -108,11 +108,12 @@
        <activation>
          <os>
            <family>unix</family>
@@ -637,50 +312,43 @@ diff -ru eclipse.platform.swt/pom.xml eclipse.platform.swt/pom.xml
  	</os>
        </activation>
  	  <modules>
-+		<!-- disabled
++<!-- disabled
  	    <module>tests/org.eclipse.swt.tests.gtk</module>
-+		  -->
++-->
  	  </modules>
-     </profile>
-     <profile>
-@@ -118,7 +119,9 @@
-     <module>examples/org.eclipse.swt.examples.ole.win32</module>
-     <module>examples/org.eclipse.swt.examples.views</module>
-     <module>tests/org.eclipse.swt.tests.fragments.feature</module>
-+	<!-- disabled
-     <module>tests/org.eclipse.swt.tests</module>
-+	  -->
-     <module>features/org.eclipse.swt.tools.feature</module>
-   </modules>
- </project>
-diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
---- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -20,10 +20,10 @@
-    </license>
- 
-    <plugin
--         id="org.eclipse.swt.gtk.linux.x86_64"
--         os="linux"
-+         id="org.eclipse.swt.gtk.freebsd.amd64"
-+         os="freebsd"
-          ws="gtk"
--         arch="x86_64"
-+         arch="amd64"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-@@ -31,10 +31,10 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.swt.gtk.linux.ppc64le"
--         os="linux"
-+         id="org.eclipse.swt.gtk.freebsd.powerpc64"
-+         os="freebsd"
-          ws="gtk"
--         arch="ppc64le"
-+         arch="powerpc64"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
+ 	  <build>
+ 	      <plugins>
+@@ -122,17 +123,22 @@
+ 	          <version>${tycho.version}</version>
+ 	          <configuration>
+ 	            <environments>
+-	            	<environment>
+-						<os>linux</os>
+-						<ws>gtk</ws>
+-						<arch>x86_64</arch>
+-					</environment>
+-					<environment>
+-			            <os>linux</os>
+-			            <ws>gtk</ws>
+-			            <arch>ppc64le</arch>
+-			          </environment>
+-	            	</environments>
++				  <environment>
++					<os>freebsd</os>
++					<ws>gtk</ws>
++					<arch>amd64</arch>
++				  </environment>
++				  <environment>
++					<os>freebsd</os>
++					<ws>gtk</ws>
++					<arch>powerpc64</arch>
++				  </environment>
++				  <environment>
++					<os>freebsd</os>
++					<ws>gtk</ws>
++					<arch>powerpc64le</arch>
++				  </environment>
++				</environments>
+ 	          </configuration>
+ 	        </plugin>
+ 	      </plugins>
diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries
index 1d925b76d229..730c72fa5c99 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt.binaries
+++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries
@@ -1,100 +1,3 @@
-diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project
---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <projectDescription>
--	<name>org.eclipse.swt.browser.chromium.gtk.linux.x86_64</name>
-+	<name>org.eclipse.swt.browser.chromium.gtk.freebsd.amd64</name>
- 	<comment></comment>
- 	<projects>
- 	</projects>
-diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF
---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-@@ -2,11 +2,11 @@
- Fragment-Host: org.eclipse.swt;bundle-version="[3.116.0,4.0.0)"
- Bundle-Name: Chromium SWT Widget for GTK
- Bundle-Vendor: Eclipse.org
--Bundle-SymbolicName: org.eclipse.swt.browser.chromium.gtk.linux.x86_64;singleton:=true
-+Bundle-SymbolicName: org.eclipse.swt.browser.chromium.gtk.freebsd.amd64;singleton:=true
- Bundle-Version: 3.117.0.qualifier
- Bundle-ManifestVersion: 2
--Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
- SWT-WS: gtk
--SWT-OS: linux
--SWT-Arch: x86_64
--Automatic-Module-Name: org.eclipse.swt.browser.chromium.gtk.linux.x86_64
-+SWT-OS: freebsd
-+SWT-Arch: amd64
-+Automatic-Module-Name: org.eclipse.swt.browser.chromium.gtk.freebsd.amd64
-diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml
---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -11,11 +11,11 @@
- 	Contributors:
- 		Guillermo Zunino, Equo - initial implementation
-  -->
--<project name="org.eclipse.swt.browser.chromium.gtk.linux.x86_64" default="build.jars" basedir=".">
-+<project name="org.eclipse.swt.browser.chromium.gtk.freebsd.amd64" default="build.jars" basedir=".">
- 
- 	<property name="swt.ws" value="gtk" />
--	<property name="swt.os" value="linux" />
--	<property name="swt.arch" value="x86_64" />
-+	<property name="swt.os" value="freebsd" />
-+	<property name="swt.arch" value="amd64" />
- 
- 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- 	<property name="version.suffix" value="3.115.0" />
-@@ -26,7 +26,7 @@
- 	
- 	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
- 		<path id="@dot.cp">
--			<fileset dir="../org.eclipse.swt.gtk.linux.x86_64/target">
-+			<fileset dir="../org.eclipse.swt.gtk.freebsd.amd64/target">
- 				<include name="*.jar"/>
- 			</fileset>
- 		</path>
-diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/pom.xml
---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -20,14 +20,14 @@
-     <relativePath>../binaries-parent/</relativePath>
-   </parent>
-   <groupId>org.eclipse.swt</groupId>
--  <artifactId>org.eclipse.swt.browser.chromium.gtk.linux.x86_64</artifactId>
-+  <artifactId>org.eclipse.swt.browser.chromium.gtk.freebsd.amd64</artifactId>
-   <version>3.117.0-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
- 
-   <properties>
--    <os>linux</os>
-+    <os>freebsd</os>
-     <ws>gtk</ws>
--    <arch>x86_64</arch>
-+    <arch>amd64</arch>
-     <buildid>${buildId}</buildid>
-     <skipRust>false</skipRust>
-     <skipJni>false</skipJni>
-@@ -61,7 +61,7 @@
-               <extraClasspathElements>
-                   <dependency>
-                       <groupId>org.eclipse.swt</groupId>
--                      <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-+                      <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
-                       <version>${project.version}</version>
-                   </dependency>
-               </extraClasspathElements>
-@@ -78,7 +78,7 @@
-         <property>
-           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
-           <name>native</name>
--          <value>gtk.linux.x86_64</value>
-+          <value>gtk.freebsd.amd64</value>
-         </property>
-       </activation>
-       <build>
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -104,12 +7,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.aarch64; singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.aarch64; singleton:=true
- Bundle-Version: 3.117.0.qualifier
+ Bundle-Version: 3.120.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
-@@ -26,8 +26,8 @@
-  org.eclipse.swt.internal.cairo; x-internal:=true,
-  org.eclipse.swt.internal.gtk; x-internal:=true,
+@@ -28,8 +28,8 @@
+  org.eclipse.swt.internal.gtk3; x-internal:=true,
+  org.eclipse.swt.internal.gtk4; x-internal:=true,
   org.eclipse.swt.internal.opengl.glx; x-internal:=true
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64))
@@ -142,7 +45,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.aarch64</artifactId>
-   <version>3.117.0-SNAPSHOT</version>
+   <version>3.120.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -180,12 +83,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
- Bundle-Version: 3.117.0.qualifier
+ Bundle-Version: 3.120.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
-@@ -26,8 +26,8 @@
-  org.eclipse.swt.internal.cairo; x-internal:=true,
-  org.eclipse.swt.internal.gtk; x-internal:=true,
+@@ -28,8 +28,8 @@
+  org.eclipse.swt.internal.gtk3; x-internal:=true,
+  org.eclipse.swt.internal.gtk4; x-internal:=true,
   org.eclipse.swt.internal.opengl.glx; x-internal:=true
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
@@ -238,7 +141,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
-   <version>3.117.0-SNAPSHOT</version>
+   <version>3.120.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -268,12 +171,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
- Bundle-Version: 3.117.0.qualifier
+ Bundle-Version: 3.120.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
-@@ -26,8 +26,8 @@
-  org.eclipse.swt.internal.cairo; x-internal:=true,
-  org.eclipse.swt.internal.gtk; x-internal:=true,
+@@ -28,8 +28,8 @@
+  org.eclipse.swt.internal.gtk3; x-internal:=true,
+  org.eclipse.swt.internal.gtk4; x-internal:=true,
   org.eclipse.swt.internal.opengl.glx; x-internal:=true
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64))
@@ -309,7 +212,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
-   <version>3.117.0-SNAPSHOT</version>
+   <version>3.120.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -339,12 +242,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64le;singleton:=true
- Bundle-Version: 3.117.0.qualifier
+ Bundle-Version: 3.120.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
-@@ -26,8 +26,8 @@
-  org.eclipse.swt.internal.cairo; x-internal:=true,
-  org.eclipse.swt.internal.gtk; x-internal:=true,
+@@ -28,8 +28,8 @@
+  org.eclipse.swt.internal.gtk3; x-internal:=true,
+  org.eclipse.swt.internal.gtk4; x-internal:=true,
   org.eclipse.swt.internal.opengl.glx; x-internal:=true
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64le))
@@ -380,7 +283,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64le</artifactId>
-   <version>3.117.0-SNAPSHOT</version>
+   <version>3.120.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
diff --git a/java/eclipse/files/patch-eclipse.platform.team b/java/eclipse/files/patch-eclipse.platform.team
index 034bb06eed8e..0ebf0de3dca1 100644
--- a/java/eclipse/files/patch-eclipse.platform.team
+++ b/java/eclipse/files/patch-eclipse.platform.team
@@ -18,7 +18,7 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/META-INF/MAN
  Bundle-Localization: fragment
 -Bundle-SymbolicName: org.eclipse.core.net.linux;singleton:=true
 +Bundle-SymbolicName: org.eclipse.core.net.freebsd;singleton:=true
- Bundle-Version: 1.0.0.qualifier
+ Bundle-Version: 1.0.100.qualifier
  Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
 -Eclipse-PlatformFilter: (osgi.os=linux)
 +Eclipse-PlatformFilter: (osgi.os=freebsd)
@@ -54,7 +54,7 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/pom.xml ecli
    <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.net.linux</artifactId>
 +  <artifactId>org.eclipse.core.net.freebsd</artifactId>
-   <version>1.0.0-SNAPSHOT</version>
+   <version>1.0.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
 @@ -35,7 +35,7 @@
@@ -96,93 +96,15 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/src/org/ecli
  					return pd;
  				}
  			} catch (UnsatisfiedLinkError e) {
-diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project
---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <projectDescription>
--	<name>org.eclipse.core.net.linux.x86_64</name>
-+	<name>org.eclipse.core.net.freebsd.amd64</name>
- 	<comment></comment>
- 	<projects>
- 	</projects>
-diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt
---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt	0000-00-00 00:00:00.000000000 +0000
-@@ -1,10 +1,10 @@
- Native Build Info:
- ------------------
- 
--platform:         linux.gtk.x86_64
-+platform:         freebsd.gtk.amd64
- built by:         Eric Williams, ericwill@redhat.com
- build date:       24-May-2018
--OS Name:          RHEL Workstation 7.5
--OS Version:       Linux 3.10.0
--Compiler version: gcc (GCC) 4.8.5
--Java version:     Java(TM) 8 Runtime Environment, Standard Edition (1.8.0.171)
-\ No newline at end of file
-+OS Name:          FreeBSD
-+OS Version:       12
-+Compiler version: FreeBSD clang version 6.0.1
-+Java version:     Java(TM) 8 Runtime Environment, Standard Edition (1.8.0.171)
-diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF
---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-@@ -3,9 +3,9 @@
- Bundle-Name: %fragmentName
- Bundle-Vendor: %providerName
- Bundle-Localization: fragment
--Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true
-+Bundle-SymbolicName: org.eclipse.core.net.freebsd.amd64;singleton:=true
- Bundle-Version: 1.2.500.qualifier
- Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
--Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64))
- Bundle-RequiredExecutionEnvironment: JavaSE-1.8
--Automatic-Module-Name: org.eclipse.core.net.linux.x86_64
-+Automatic-Module-Name: org.eclipse.core.net.freebsd.amd64
-diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf
---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
-@@ -1,2 +1,2 @@
- requires.0.namespace=org.eclipse.equinox.p2.iu
--requires.0.name=org.eclipse.core.net.linux
-+requires.0.name=org.eclipse.core.net.freebsd
-diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties
---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
-@@ -11,5 +11,5 @@
- # Contributors:
- #     IBM Corporation - initial API and implementation
- ###############################################################################
--fragmentName = Proxy for Linux x86_64
-+fragmentName = Proxy for FreeBSD amd64
- providerName = Eclipse.org
-diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml
---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -18,7 +18,7 @@
-     <relativePath>../../</relativePath>
-   </parent>
-   <groupId>org.eclipse.core</groupId>
--  <artifactId>org.eclipse.core.net.linux.x86_64</artifactId>
-+  <artifactId>org.eclipse.core.net.freebsd.amd64</artifactId>
-   <version>1.2.500-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
- 
 diff -ru eclipse.platform.team/pom.xml eclipse.platform.team/pom.xml
 --- eclipse.platform.team/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.team/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -73,8 +73,8 @@
-     <module>features/org.eclipse.cvs-feature</module>
+@@ -67,7 +67,7 @@
+     <module>examples/org.eclipse.team.examples.filesystem</module>
  
      <!-- fragments -->
 -    <module>bundles/org.eclipse.core.net.linux</module>
--    <module>bundles/org.eclipse.core.net.linux.x86_64</module>
 +    <module>bundles/org.eclipse.core.net.freebsd</module>
-+    <module>bundles/org.eclipse.core.net.freebsd.amd64</module>
+     <module>bundles/org.eclipse.core.net.win32</module>
      <module>bundles/org.eclipse.core.net.win32.x86_64</module>
      <module>tests</module>
-    
diff --git a/java/eclipse/files/patch-eclipse.platform.text b/java/eclipse/files/patch-eclipse.platform.text
index fd282684742d..de0dc33ff4f1 100644
--- a/java/eclipse/files/patch-eclipse.platform.text
+++ b/java/eclipse/files/patch-eclipse.platform.text
@@ -1,7 +1,7 @@
 diff -ru eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml
 --- eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -1312,7 +1312,7 @@
+@@ -1354,7 +1354,7 @@
              %blockSelectionModeFont.description
           </description>
           <fontValue
diff --git a/java/eclipse/files/patch-rt.equinox.bundles b/java/eclipse/files/patch-rt.equinox.bundles
index b707c3069768..1d41747dd52a 100644
--- a/java/eclipse/files/patch-rt.equinox.bundles
+++ b/java/eclipse/files/patch-rt.equinox.bundles
@@ -1,3 +1,15 @@
+diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java rt.equinox.bundles/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java	0000-00-00 00:00:00.000000000 +0000
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java	0000-00-00 00:00:00.000000000 +0000
+@@ -187,7 +187,7 @@
+ 			String osName = StructuredTextActivator.getProperty("os.name"); //$NON-NLS-1$/
+ 			if (osName != null)
+ 				osName = osName.toLowerCase();
+-			boolean supportedOS = osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
++			boolean supportedOS = osName.startsWith("windows") || osName.startsWith("freebsd") || osName.startsWith("linux") || osName.startsWith("mac"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ 			if (supportedOS) {
+ 				// Check whether the current language uses a bidi script (Arabic, Hebrew, Farsi or Urdu)
+ 				boolean isBidi = "iw".equals(language) || //$NON-NLS-1$
 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF
 --- rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -53,60 +65,10 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml
                <ws>gtk</ws>
              </environment>
            </environments>
-diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project
---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <projectDescription>
--	<name>org.eclipse.equinox.security.linux.x86_64</name>
-+	<name>org.eclipse.equinox.security.freebsd.amd64</name>
- 	<comment></comment>
- 	<projects>
- 	</projects>
-diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF
---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-@@ -1,12 +1,12 @@
- Manifest-Version: 1.0
- Bundle-ManifestVersion: 2
- Bundle-Name: %fragmentName
--Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true
-+Bundle-SymbolicName: org.eclipse.equinox.security.freebsd.amd64;singleton:=true
- Bundle-Version: 1.1.500.qualifier
- Bundle-Vendor: %providerName
- Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
- Bundle-RequiredExecutionEnvironment: JavaSE-1.8
- Bundle-Localization: fragment
--Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
--Automatic-Module-Name: org.eclipse.equinox.security.linux.x86_64
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64))
-+Automatic-Module-Name: org.eclipse.equinox.security.freebsd.amd64
- Eclipse-BundleShape: dir
-diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf
---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
-@@ -1,2 +1,2 @@
- requires.0.namespace=org.eclipse.equinox.p2.iu
--requires.0.name=org.eclipse.equinox.security.linux
-\ No newline at end of file
-+requires.0.name=org.eclipse.equinox.security.freebsd
-diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml
---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -19,7 +19,7 @@
-     <relativePath>../../</relativePath>
-   </parent>
-   <groupId>org.eclipse.equinox</groupId>
--  <artifactId>org.eclipse.equinox.security.linux.x86_64</artifactId>
-+  <artifactId>org.eclipse.equinox.security.freebsd.amd64</artifactId>
-   <version>1.1.500-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
- 
 diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml
 --- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -217,9 +217,9 @@
+@@ -126,9 +126,9 @@
           unpack="false"/>
  
     <plugin
@@ -119,7 +81,7 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -227,9 +227,9 @@
+@@ -136,9 +136,9 @@
           unpack="false"/>
  
     <plugin
@@ -135,14 +97,12 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt
 diff -ru rt.equinox.bundles/pom.xml rt.equinox.bundles/pom.xml
 --- rt.equinox.bundles/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -84,8 +84,8 @@
+@@ -78,7 +78,7 @@
      <module>bundles/org.eclipse.equinox.security</module>
      <module>bundles/org.eclipse.equinox.security.macosx</module>
      <module>bundles/org.eclipse.equinox.security.win32.x86_64</module>
 -    <module>bundles/org.eclipse.equinox.security.linux</module>
--    <module>bundles/org.eclipse.equinox.security.linux.x86_64</module>
 +    <module>bundles/org.eclipse.equinox.security.freebsd</module>
-+    <module>bundles/org.eclipse.equinox.security.freebsd.amd64</module>
      <module>bundles/org.eclipse.equinox.bidi</module>
      <module>bundles/org.eclipse.equinox.cm</module>
      <module>bundles/org.eclipse.equinox.console</module>
diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework
index c2d4aad7c8ed..1d4689898157 100644
--- a/java/eclipse/files/patch-rt.equinox.framework
+++ b/java/eclipse/files/patch-rt.equinox.framework
@@ -7,7 +7,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true
- Bundle-Version: 1.2.300.qualifier
+ Bundle-Version: 1.2.500.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
 -Bundle-Localization: launcher.gtk.linux.aarch64
@@ -23,7 +23,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId>
-   <version>1.2.300-SNAPSHOT</version>
+   <version>1.2.500-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -52,7 +52,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true
- Bundle-Version: 1.2.300.qualifier
+ Bundle-Version: 1.2.500.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
 -Bundle-Localization: launcher.gtk.linux.x86_64
@@ -78,7 +78,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId>
-   <version>1.2.300-SNAPSHOT</version>
+   <version>1.2.500-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -110,7 +110,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true
- Bundle-Version: 1.2.300.qualifier
+ Bundle-Version: 1.2.500.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
 -Bundle-Localization: launcher.gtk.linux.ppc64le
@@ -126,7 +126,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId>
-   <version>1.2.300-SNAPSHOT</version>
+   <version>1.2.500-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -147,7 +147,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le;singleton:=true
- Bundle-Version: 1.2.300.qualifier
+ Bundle-Version: 1.2.500.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
 -Bundle-Localization: launcher.gtk.linux.ppc64le
@@ -163,7 +163,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le</artifactId>
-   <version>1.2.300-SNAPSHOT</version>
+   <version>1.2.500-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -208,7 +208,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bu
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -53,19 +53,29 @@
+@@ -57,18 +57,27 @@
           fragment="true"/>
  
     <plugin
@@ -223,28 +223,25 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/fe
           install-size="0"
           version="0.0.0"
           fragment="true"/>
--         
-+
-    <plugin
--         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
--         os="linux"
++   <plugin
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le"
 +         os="freebsd"
-          ws="gtk"
++         ws="gtk"
 +         arch="powerpc64le"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"/>
-+
-+   <plugin
+ 
+    <plugin
+-         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
+-         os="linux"
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64"
 +         os="freebsd"
-+         ws="gtk"
+          ws="gtk"
           arch="aarch64"
           download-size="0"
-          install-size="0"
-@@ -73,10 +83,10 @@
+@@ -77,10 +86,10 @@
           fragment="true"/>
  
     <plugin
@@ -275,7 +272,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/li
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	0000-00-00 00:00:00.000000000 +0000
-@@ -112,8 +112,13 @@
+@@ -117,8 +117,13 @@
  				;;
  		esac
  		;;
@@ -290,7 +287,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/li
  	;;
  esac
  export CC
-@@ -146,19 +151,20 @@
+@@ -151,19 +156,20 @@
  
  LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
  OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
@@ -377,7 +374,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/po
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties	0000-00-00 00:00:00.000000000 +0000
-@@ -20,15 +20,18 @@
+@@ -20,17 +20,20 @@
  root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe
  root.win32.win32.x86_64.permissions.755=launcher.exe
  
@@ -400,6 +397,8 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re
 +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
 +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
  
+ root.linux.gtk.loongarch64=bin/gtk/linux/loongarch64,gtk_root
+ root.linux.gtk.loongarch64.permissions.755=launcher
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml	0000-00-00 00:00:00.000000000 +0000
@@ -431,7 +430,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re
  			<fileset dir="${basedir}/gtk_root" includes="**"			/>
  		</copy>
 -		<chmod perm="755" dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" includes="launcher" />
-+		<chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" includes="launcher" />
++		<chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64le/${collectingFolder}" includes="launcher" />
  	</target>
 -	<target name="rootFileslinux_gtk_x86_64">
 -		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
@@ -454,10 +453,10 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re
 +		</copy>
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="launcher" />
 +	</target>
- 	<target name="rootFileslinux_gtk_ia64">
- 		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
- 		<copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -146,9 +154,9 @@
+ 	<target name="rootFileslinux_gtk_loongarch64">
+ 		<mkdir dir="${feature.base}/linux.gtk.loongarch64/${collectingFolder}"/>
+ 		<copy todir="${feature.base}/linux.gtk.loongarch64/${collectingFolder}" failonerror="true" overwrite="true">
+@@ -154,9 +162,9 @@
  	<target name="rootFilesgroup_group_group">
  		<antcall target="rootFileswin32_win32_x86_64"/>
  		<antcall target="rootFilesmacosx_cocoa_x86_64"/>
@@ -478,17 +477,17 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml
      </profile>
      <profile>
 -      <id>build-native-launchers-gtk.linux.arm</id>
-+      <id>build-native-launchers-gtk.freebsd.armv7</id>
++      <id>build-native-launchers-gtk.freebsd.arm</id>
        <activation>
  	<property>
  	  <name>native</name>
 -	  <value>gtk.linux.arm</value>
-+	  <value>gtk.freebsd.armv7</value>
++	  <value>gtk.freebsd.arm</value>
          </property>
        </activation>
        <modules>
 -	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
-+	<module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7</module>
++	<module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.arm</module>
        </modules>
      </profile>
      <profile>
@@ -506,8 +505,8 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml
 +	<module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64</module>
        </modules>
      </profile>
-   </profiles>
-@@ -89,9 +89,10 @@
+     <profile>
+@@ -101,9 +101,10 @@
      <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx</module>
      <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>
      <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64</module>
diff --git a/java/eclipse/files/patch-rt.equinox.p2 b/java/eclipse/files/patch-rt.equinox.p2
index 8cc3a6a59f7f..5283a149eb72 100644
--- a/java/eclipse/files/patch-rt.equinox.p2
+++ b/java/eclipse/files/patch-rt.equinox.p2
@@ -17,8 +17,8 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r
        <plugin id="org.eclipse.core.expressions"/>
        <plugin id="org.eclipse.core.jobs"/>
        <plugin id="org.eclipse.core.net"/>
--      <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/>
-+      <plugin id="org.eclipse.core.net.freebsd.amd64" fragment="true"/>
+-      <plugin id="org.eclipse.core.net.linux" fragment="true"/>
++      <plugin id="org.eclipse.core.net.freebsd" fragment="true"/>
        <plugin id="org.eclipse.core.runtime"/>
        <plugin id="org.eclipse.e4.core.commands"/>
        <plugin id="org.eclipse.e4.core.contexts"/>
@@ -26,13 +26,13 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r
        <plugin id="org.eclipse.equinox.preferences"/>
        <plugin id="org.eclipse.equinox.registry"/>
        <plugin id="org.eclipse.equinox.security"/>
--      <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/>
-+      <plugin id="org.eclipse.equinox.security.freebsd.amd64" fragment="true"/>
+-      <plugin id="org.eclipse.equinox.security.linux" fragment="true"/>
++      <plugin id="org.eclipse.equinox.security.freebsd" fragment="true"/>
        <plugin id="org.eclipse.equinox.security.ui"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-@@ -134,7 +134,7 @@
-       <plugin id="org.eclipse.osgi.util"/>
+@@ -133,7 +133,7 @@
+       <plugin id="org.eclipse.osgi.services"/>
        <plugin id="org.eclipse.swt"/>
        <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
 -      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
@@ -43,14 +43,14 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r
 diff -ru rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
 --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -184,9 +184,9 @@
+@@ -177,9 +177,9 @@
           unpack="false"/>
  
     <plugin
--         id="org.eclipse.equinox.security.linux.x86_64"
+-         id="org.eclipse.equinox.security.linux"
 -         os="linux"
 -         arch="x86_64"
-+         id="org.eclipse.equinox.security.freebsd.amd64"
++         id="org.eclipse.equinox.security.freebsd"
 +         os="freebsd"
 +         arch="amd64"
           download-size="0"