java/eclipse: update 4.16 -> 4.21

This release is 1.5 years overdue and 6 months out-of-date, but is an important interim step to the 4.24 release due in June 2022. Massive thanks go to Patrick Mackinlay who resolved the 2 critical bugs preventing update from coming out sooner! Author: Jonathan Chen <jonc@chen.org.nz> PR: 264400
2022-06-03 12:06:36 +02:00
parent 8a8b00d8f2
commit a0c13b4a90
23 changed files with 1488 additions and 801 deletions
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -1,13 +1,13 @@
 # Created by: Jonathan Chen <jonc@chen.org.nz>
+# $FreeBSD$

 PORTNAME=	eclipse
-PORTVERSION=	4.16
-PORTREVISION=	1
+PORTVERSION=	4.21
 CATEGORIES=	java devel

 # Update to eclipse.platform.releng.aggregator.git git-tag on git.eclipse.org
-ECLIPSE_TAG=	R4_16
-ECLIPSE_TSTAMP=	20200617-1404
+ECLIPSE_TAG=	R4_21
+ECLIPSE_TSTAMP=	20210915-1206

 ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
 ECLIPSE_MODULES=jdt/eclipse.jdt \
@@ -42,14 +42,19 @@ MASTER_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/
 DISTFILES+=	${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
 .endfor

+CEF_FILE=	cef_binary_3.3071.1649.g98725e6_linux64_minimal
+MASTER_SITES+=	https://cef-builds.spotifycdn.com/:spotify \
+		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:github
+DISTFILES+=	${CEF_FILE}.tar.bz2:spotify
+
 DIST_SUBDIR=	${PORTNAME}

 MAINTAINER=	jonc@chen.org.nz
-COMMENT=	Eclipse IDE 2020-06
+COMMENT=	Eclipse IDE 2020-09

 LICENSE=	EPL

-ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le

 BUILD_DEPENDS=	git:devel/git@lite \
 		${LOCALBASE}/share/java/maven/bin/mvn:devel/maven \
@@ -74,17 +79,20 @@ DESKTOP_ENTRIES="Eclipse" \

 SUB_FILES=	${PORTNAME}

-MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME}
-MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
-MAVEN_ECLIPSE=	-Dnative=gtk.freebsd.${ARCH} -DforceContextQualifier=v${ECLIPSE_TSTAMP}
+MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome
+MAVEN_ECLIPSE=	-Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION} \
+		-Dlocal.cefsource=${WRKDIR}/${CEF_FILE} \
+		-Dlocal.patchfiles=${FILESDIR} \
+		-Dnative=gtk.freebsd.${ARCH} \
+		-DforceContextQualifier=v${ECLIPSE_TSTAMP}

-ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz
+ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz

 # Let's abuse this to get to the right place.
 WRKSRC_SUBDIR=	../eclipse.platform.releng.aggregator-${ECLIPSE_TAG}

 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_REPO} ${MAVEN_ECLIPSE} -DskipTests clean verify
+	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_ECLIPSE} -DskipTests clean verify

 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
--- a/java/eclipse/Makefile.plugins
+++ b/java/eclipse/Makefile.plugins
@@ -1,3 +1,4 @@
+# $FreeBSD$
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,53 +1,55 @@
-TIMESTAMP = 1592448357
-SHA256 (eclipse/eclipse.jdt-R4_16.tar.xz) = 9f93c368bf782ad8d3e4124f0ec11087b1b462052139165cec7aa4fa9bcc7050
-SIZE (eclipse/eclipse.jdt-R4_16.tar.xz) = 29304
-SHA256 (eclipse/eclipse.jdt.core-R4_16.tar.xz) = 1b734dfa8ddd40e09efa37303c099ad2dd11633474e7270a9c043dc625d93728
-SIZE (eclipse/eclipse.jdt.core-R4_16.tar.xz) = 8650672
-SHA256 (eclipse/eclipse.jdt.core.binaries-R4_16.tar.xz) = 9cb0d7c97a46191ff60738a8da327552786293f05392bd0be10c30ecbf78b637
-SIZE (eclipse/eclipse.jdt.core.binaries-R4_16.tar.xz) = 34416600
-SHA256 (eclipse/eclipse.jdt.debug-R4_16.tar.xz) = 845eedbf3a424f4cc7a138028bfaea74a4e6f93871903603bb886b6bc9c96d23
-SIZE (eclipse/eclipse.jdt.debug-R4_16.tar.xz) = 1462764
-SHA256 (eclipse/eclipse.jdt.ui-R4_16.tar.xz) = 08ea5e36ea0279bd86d2a2fb877664becfd043e4f37291ee4f173f7f41246e0b
-SIZE (eclipse/eclipse.jdt.ui-R4_16.tar.xz) = 15771884
-SHA256 (eclipse/eclipse.pde.build-R4_16.tar.xz) = e56ac953b3722de9a40d6b1759f5da78bf369dc49bcce47435ce9fdec6e89fea
-SIZE (eclipse/eclipse.pde.build-R4_16.tar.xz) = 868696
-SHA256 (eclipse/eclipse.pde.ui-R4_16.tar.xz) = 7db5936fc6d7cbc2f02dea114c00099837af6f37120d6a10da2b8ef2b7ded4c1
-SIZE (eclipse/eclipse.pde.ui-R4_16.tar.xz) = 29819796
-SHA256 (eclipse/eclipse.platform-R4_16.tar.xz) = 3d5d3e6b3968c744c4a94e968ae7f29ef8229f93556351007e054922c751f82e
-SIZE (eclipse/eclipse.platform-R4_16.tar.xz) = 1446740
-SHA256 (eclipse/eclipse.platform.common-R4_16.tar.xz) = a1fbec04f8b1bc28082ca23d8850efe44e3bbe1fa7bd38c8cc7a8b5536cd9c99
-SIZE (eclipse/eclipse.platform.common-R4_16.tar.xz) = 35851024
-SHA256 (eclipse/eclipse.platform.debug-R4_16.tar.xz) = 649b547351db7acafad225e90915b1bd96cb3ae1964b4c420956030b5979e431
-SIZE (eclipse/eclipse.platform.debug-R4_16.tar.xz) = 1372776
-SHA256 (eclipse/eclipse.platform.releng-R4_16.tar.xz) = 3b9016785fc52e75462c69222c0855228b23a8eac3184e615f6a045a13dda643
-SIZE (eclipse/eclipse.platform.releng-R4_16.tar.xz) = 406928
-SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_16.tar.xz) = bdbc90306a3dabaf3be6c01ca090f7da6434eada0a2137935acc2aa11fd3c0c1
-SIZE (eclipse/eclipse.platform.releng.aggregator-R4_16.tar.xz) = 605404
-SHA256 (eclipse/eclipse.platform.resources-R4_16.tar.xz) = f443677069d43b444b17627f0a593cf6fbb82eb86a69f37c9c331267d1d51d33
-SIZE (eclipse/eclipse.platform.resources-R4_16.tar.xz) = 813528
-SHA256 (eclipse/eclipse.platform.runtime-R4_16.tar.xz) = 69d32fc771c293c33d1adb0bbf480cb4b79116d23f8ec5ebf8f3b243894b59ce
-SIZE (eclipse/eclipse.platform.runtime-R4_16.tar.xz) = 431312
-SHA256 (eclipse/eclipse.platform.swt-R4_16.tar.xz) = d864f1d3a275d93118be35a360c92d8943c3eb9d67cc72916bab5ecd85dc7262
-SIZE (eclipse/eclipse.platform.swt-R4_16.tar.xz) = 6236756
-SHA256 (eclipse/eclipse.platform.swt.binaries-R4_16.tar.xz) = b875dba475ed19f2b55cbade3a54b4b9afe522037efeb42909e1e9d89dd84dc0
-SIZE (eclipse/eclipse.platform.swt.binaries-R4_16.tar.xz) = 563508
-SHA256 (eclipse/eclipse.platform.team-R4_16.tar.xz) = 180590b0a7516e246c7343298506f62f29c853e4090899891c6c301d4be801a7
-SIZE (eclipse/eclipse.platform.team-R4_16.tar.xz) = 4633900
-SHA256 (eclipse/eclipse.platform.text-R4_16.tar.xz) = 1d243c92c8eb67a9aef9de7c87bf228f4d057b380b7b60ac9ca77fa64363f0f9
-SIZE (eclipse/eclipse.platform.text-R4_16.tar.xz) = 1319632
-SHA256 (eclipse/eclipse.platform.ua-R4_16.tar.xz) = 8c3ca5fe144588f2d994906461779fa782b257f3643b7686a9606bcf7b907c75
-SIZE (eclipse/eclipse.platform.ua-R4_16.tar.xz) = 4621924
-SHA256 (eclipse/eclipse.platform.ui-R4_16.tar.xz) = fd232ac1fddaec771ec895b995fb0c47813577e3b5a87f72b29b01363e08eeca
-SIZE (eclipse/eclipse.platform.ui-R4_16.tar.xz) = 5967112
-SHA256 (eclipse/eclipse.platform.ui.tools-R4_16.tar.xz) = 43a75d63cb4f294fa39b749dfe4e6751493ffbc5c45e8009099bb8683290009b
-SIZE (eclipse/eclipse.platform.ui.tools-R4_16.tar.xz) = 328668
-SHA256 (eclipse/rt.equinox.binaries-R4_16.tar.xz) = e7e198a3ffa5f0392277e4f648ca59469ec8bbaeafe553620b023f287d9fb8f1
-SIZE (eclipse/rt.equinox.binaries-R4_16.tar.xz) = 299708
-SHA256 (eclipse/rt.equinox.bundles-R4_16.tar.xz) = 7a91d247020b62cb5d2fe9886e9ae5693b60aa0d3d1331f88b83070d65285637
-SIZE (eclipse/rt.equinox.bundles-R4_16.tar.xz) = 1161164
-SHA256 (eclipse/rt.equinox.framework-R4_16.tar.xz) = c1f2d3410c546e09adbed2eb97880d7f109890a6abcb625291271e776224e780
-SIZE (eclipse/rt.equinox.framework-R4_16.tar.xz) = 2827340
-SHA256 (eclipse/rt.equinox.p2-R4_16.tar.xz) = ef8216e3013688a5f2bd62128a10f19c420bfc587345d47810f25e1d254c4bf1
-SIZE (eclipse/rt.equinox.p2-R4_16.tar.xz) = 48490416
-SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.16_GH0.tar.gz) = 73355577a36e6ee976464ab16416fc966d91763f20dfa70ff4d4fd7ff460cfc5
-SIZE (eclipse/daemonblade-eclipse-maven-repo-4.16_GH0.tar.gz) = 198477770
+TIMESTAMP = 1653887228
+SHA256 (eclipse/eclipse.jdt-R4_21.tar.xz) = 8b1af3b43f76d3cc74fb44b15574fe2744bd5282e7e1c2290b779eeebfc94dfc
+SIZE (eclipse/eclipse.jdt-R4_21.tar.xz) = 29324
+SHA256 (eclipse/eclipse.jdt.core-R4_21.tar.xz) = 5df3da6d88d68c433cc3ed0b8de62a7ccc481b6bbe7434e156230747a8611c46
+SIZE (eclipse/eclipse.jdt.core-R4_21.tar.xz) = 8815900
+SHA256 (eclipse/eclipse.jdt.core.binaries-R4_21.tar.xz) = d9632f5086217d780d8eebea0da75607272002fee5cd22f3cec8c08fee00c6c6
+SIZE (eclipse/eclipse.jdt.core.binaries-R4_21.tar.xz) = 34416428
+SHA256 (eclipse/eclipse.jdt.debug-R4_21.tar.xz) = 7910a349bb0afaa3a98b65be959d0ae47da745f3c96a183f2b2e2e5eb585dd04
+SIZE (eclipse/eclipse.jdt.debug-R4_21.tar.xz) = 1469208
+SHA256 (eclipse/eclipse.jdt.ui-R4_21.tar.xz) = cb6d963ab0422523897fade2f79be0807f7abe709a4a9bdbd5d027694179daea
+SIZE (eclipse/eclipse.jdt.ui-R4_21.tar.xz) = 16293416
+SHA256 (eclipse/eclipse.pde.build-R4_21.tar.xz) = ff32409190bcaa29b8fda76eee98cfa3e3e117ec73e8043f9d2c56209108f033
+SIZE (eclipse/eclipse.pde.build-R4_21.tar.xz) = 847516
+SHA256 (eclipse/eclipse.pde.ui-R4_21.tar.xz) = 92e4305b0d2de70c1c866ba35f2c5d79f6335d4c8d5b828926ea20a729e7b6ae
+SIZE (eclipse/eclipse.pde.ui-R4_21.tar.xz) = 25742828
+SHA256 (eclipse/eclipse.platform-R4_21.tar.xz) = 7b3cc0234f4dc9d4a9d56dc4550dd0cfa21263eb89ca221ce2eb22c258795535
+SIZE (eclipse/eclipse.platform-R4_21.tar.xz) = 1314336
+SHA256 (eclipse/eclipse.platform.common-R4_21.tar.xz) = 38e7a3e41977037d74ab14c9c5e5a471a6a9f593f133f72981b7850d199d6f53
+SIZE (eclipse/eclipse.platform.common-R4_21.tar.xz) = 33482124
+SHA256 (eclipse/eclipse.platform.debug-R4_21.tar.xz) = fd4d24ad9ab36a9d8c9a17492608156508862596f304a21a32a877adf9133493
+SIZE (eclipse/eclipse.platform.debug-R4_21.tar.xz) = 1524768
+SHA256 (eclipse/eclipse.platform.releng-R4_21.tar.xz) = 63fb661948e191ed0c96a7149f4e4c6f7b9536360fced8321d5d208c500fe1ed
+SIZE (eclipse/eclipse.platform.releng-R4_21.tar.xz) = 154672
+SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_21.tar.xz) = 2774ce3870d27d95bcecc3e9ab04de649a27b3bbcf9111c828b17a80fc639d9a
+SIZE (eclipse/eclipse.platform.releng.aggregator-R4_21.tar.xz) = 611344
+SHA256 (eclipse/eclipse.platform.resources-R4_21.tar.xz) = 643f2ac4bd62f1747f3e30ffe09043d96cb92f32b7e943dddad0fd24f87dc370
+SIZE (eclipse/eclipse.platform.resources-R4_21.tar.xz) = 826960
+SHA256 (eclipse/eclipse.platform.runtime-R4_21.tar.xz) = 8ea6339fa54edf08cb0c66e4a1e664f3ddcd688fd05453e7d202373c29b4898d
+SIZE (eclipse/eclipse.platform.runtime-R4_21.tar.xz) = 431772
+SHA256 (eclipse/eclipse.platform.swt-R4_21.tar.xz) = d6f2c36267809c04717e5951cdcceaf102892580e0a5e887eb79e0b49d5c9113
+SIZE (eclipse/eclipse.platform.swt-R4_21.tar.xz) = 6395368
+SHA256 (eclipse/eclipse.platform.swt.binaries-R4_21.tar.xz) = d43e8322b90af3bebdd9ed19b318e760915d7ce8f59d9c530397c7e7b4d40b29
+SIZE (eclipse/eclipse.platform.swt.binaries-R4_21.tar.xz) = 2250692
+SHA256 (eclipse/eclipse.platform.team-R4_21.tar.xz) = fe57896e30e148938547fc0fc4cf23033ce9fdf6db1a9192dbd6b7b49af8c963
+SIZE (eclipse/eclipse.platform.team-R4_21.tar.xz) = 4564772
+SHA256 (eclipse/eclipse.platform.text-R4_21.tar.xz) = 6e2b1c4252786c995d79d14504195a64a46a4a335e2f4a27b3ddb9e9cfeadaf9
+SIZE (eclipse/eclipse.platform.text-R4_21.tar.xz) = 1333172
+SHA256 (eclipse/eclipse.platform.ua-R4_21.tar.xz) = 53fb7f58195767221cc7ef579a0d758fd5cc4c4627d722b60122afff5565a5f4
+SIZE (eclipse/eclipse.platform.ua-R4_21.tar.xz) = 4654924
+SHA256 (eclipse/eclipse.platform.ui-R4_21.tar.xz) = 45f7abbb7546f009ac7b85935ed3f0f713ab64cd43c39fba4919bae3c62c8c42
+SIZE (eclipse/eclipse.platform.ui-R4_21.tar.xz) = 5816708
+SHA256 (eclipse/eclipse.platform.ui.tools-R4_21.tar.xz) = ad9d54fc2f7b0c87e73edf142310647cc81aebfa08e40263b949a57a337aeab4
+SIZE (eclipse/eclipse.platform.ui.tools-R4_21.tar.xz) = 329028
+SHA256 (eclipse/rt.equinox.binaries-R4_21.tar.xz) = 6dcebfcbf005d49f60b153ec256dacaf199acda3e6c627b0aac03f241a1738b7
+SIZE (eclipse/rt.equinox.binaries-R4_21.tar.xz) = 446104
+SHA256 (eclipse/rt.equinox.bundles-R4_21.tar.xz) = 69e9af9d8e297fe19d1c5a0a624d8f5c6fe81f53614f8cbdb42b4f78eb3097c6
+SIZE (eclipse/rt.equinox.bundles-R4_21.tar.xz) = 1154508
+SHA256 (eclipse/rt.equinox.framework-R4_21.tar.xz) = 5b2de266aba0fe7a6245c34357f163b9156806697ded80ecd59611b77bf5990c
+SIZE (eclipse/rt.equinox.framework-R4_21.tar.xz) = 1438564
+SHA256 (eclipse/rt.equinox.p2-R4_21.tar.xz) = be31e8cff1af6703c283c0df1c0902e8b8efff07d4dd9d9fa3bccc0773c28b1a
+SIZE (eclipse/rt.equinox.p2-R4_21.tar.xz) = 48558608
+SHA256 (eclipse/cef_binary_3.3071.1649.g98725e6_linux64_minimal.tar.bz2) = 7eea540d122ceb35a0ce1970e72077b861e23ffbbe55288522b57141934f86f2
+SIZE (eclipse/cef_binary_3.3071.1649.g98725e6_linux64_minimal.tar.bz2) = 143099195
+SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.21_GH0.tar.gz) = 6c9267690fedd16d5b6ff069759cff74206643f51db79e2ad469d4c2bb60c4ed
+SIZE (eclipse/daemonblade-eclipse-maven-repo-4.21_GH0.tar.gz) = 226452400
--- a/java/eclipse/files/cef-patch
+++ b/java/eclipse/files/cef-patch
@@ -0,0 +1,24 @@
+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
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -3,5 +3,14 @@
 # FreeBSD-specific startup script for Eclipse Platform
 #
 # See: http://www.eclipse.org
+#
+
+# Create required Webkit communication directories removed by:
+# https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/163641/
+for D in SWT-GDBusServer SWT-WebExtensionGDBusServer
+do
+	mkdir -p /tmp/${D}
+	chmod -f 1777 /tmp/${D}
+done

 JAVA_VERSION="%%JAVA_VERSION%%" exec %%DATADIR%%/eclipse "$@"
--- a/java/eclipse/files/patch-eclipse-platform-parent
+++ b/java/eclipse/files/patch-eclipse-platform-parent
@@ -1,18 +1,19 @@
--- eclipse-platform-parent/pom.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse-platform-parent/pom.xml	2021-03-08 19:09:17.636105000 +0100
-@@ -80,9 +80,9 @@
+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 @@
       'eclipiserun-repo' repository, such as for computing .api-descriptions and
       generating API Tools reports.
     -->
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds/</eclipserun-repo>
-+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16/</eclipserun-repo>
+-    <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>
     
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds</comparator.repo>
-+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16</comparator.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>
 
-     <!--
-       NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
-@@ -254,16 +254,21 @@
+     <!-- 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 @@
           </target>
           <environments>
             <environment>
@@ -29,21 +30,23 @@
 -              <arch>ppc64le</arch>
 +              <arch>powerpc64</arch>
             </environment>
-             <environment>
+            <environment>
 +              <os>freebsd</os>
 +              <ws>gtk</ws>
 +              <arch>powerpc64le</arch>
 +            </environment>
-+            <environment>
-               <os>win32</os>
-               <ws>win32</ws>
-               <arch>x86_64</arch>
-@@ -626,7 +631,7 @@
+              <environment>
+-              <os>linux</os>
+              <os>freebsd</os>
+               <ws>gtk</ws>
+               <arch>aarch64</arch>
+             </environment>
+@@ -624,7 +629,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.16-I-builds</eclipse-p2-repo.url>
-+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16</eclipse-p2-repo.url>
+-        <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>
       </properties>
       <repositories>
         <repository>
--- a/java/eclipse/files/patch-eclipse.pde.build
+++ b/java/eclipse/files/patch-eclipse.pde.build
@@ -18,7 +18,7 @@ diff -ru eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElement
 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
-@@ -704,7 +704,7 @@
+@@ -694,7 +694,7 @@
 			arguments.add("-sf"); //$NON-NLS-1$
 			arguments.add(links[i]);
 			arguments.add(links[i + 1]);
@@ -30,7 +30,7 @@ diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/bu
 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
-@@ -922,7 +922,7 @@
+@@ -912,7 +912,7 @@
 		for (int i = 0; i < links.length; i += 2) {
 			arguments.add(links[i]);
 			arguments.add(links[i + 1]);
--- a/java/eclipse/files/patch-eclipse.pde.ui
+++ b/java/eclipse/files/patch-eclipse.pde.ui
@@ -1,6 +1,7 @@
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product.orig	2020-05-14 19:49:48.000000000 +0200
-+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	2021-03-08 19:10:46.275610000 +0100
-@@ -80,8 +80,9 @@
+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"/>
--- a/java/eclipse/files/patch-eclipse.platform.releng
+++ b/java/eclipse/files/patch-eclipse.platform.releng
@@ -1,8 +1,20 @@
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.orig	2020-05-28 13:29:36.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml	2021-03-08 19:12:31.612581000 +0100
-@@ -96,9 +96,9 @@
+diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -96,8 +96,8 @@
          unpack="false"/>
 
+    <plugin
+-         id="org.eclipse.core.net.linux"
+-         os="linux"
+         id="org.eclipse.core.net.freebsd"
+         os="freebsd"
+          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"
@@ -13,7 +25,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-@@ -362,9 +362,9 @@
+@@ -371,9 +371,9 @@
          unpack="false"/>
 
    <plugin
@@ -26,7 +38,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-@@ -401,9 +401,9 @@
+@@ -410,18 +410,28 @@
          unpack="false"/>
 
    <plugin
@@ -39,10 +51,10 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-@@ -411,6 +411,16 @@
+          fragment="true"
          unpack="false"/>
- 
-    <plugin
+
+   <plugin
 +         id="org.eclipse.core.filesystem.freebsd.powerpc64le"
 +         os="freebsd"
 +         arch="powerpc64le"
@@ -51,14 +63,29 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.core.variables"
+          
+    <plugin
+-         id="org.eclipse.core.filesystem.linux.aarch64"
+-         os="linux"
+         id="org.eclipse.core.filesystem.freebsd.aarch64"
+         os="freebsd"
+          arch="aarch64"
          download-size="0"
          install-size="0"
-@@ -465,9 +475,9 @@
+@@ -484,8 +494,8 @@
          unpack="false"/>
 
+    <plugin
+-         id="org.eclipse.equinox.security.linux"
+-         os="linux"
+         id="org.eclipse.equinox.security.freebsd"
+         os="freebsd"
+          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"
@@ -69,9 +96,10 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig	2020-05-28 13:29:36.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	2021-03-08 19:12:49.804474000 +0100
-@@ -55,10 +55,11 @@
+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
+@@ -56,10 +56,11 @@
               </plugins>
               <excludes>
                 <plugin id="org.eclipse.platform.doc.user"/>
@@ -85,15 +113,3 @@
                 <plugin id="org.eclipse.core.resources.win32.x86_64"/>
               </excludes>
             </configuration>
--- eclipse.platform.releng/pom.xml.orig	2020-05-28 13:29:36.000000000 +0200
-+++ eclipse.platform.releng/pom.xml	2021-03-08 19:05:06.938707000 +0100
-@@ -66,7 +66,9 @@
-     <module>features/org.eclipse.releng.tools</module>
-     <module>features/org.eclipse.sdk</module>
-     <module>features/org.eclipse.sdk.examples-feature</module>
-+<!--
-     <module>features/org.eclipse.sdk.tests</module>
-+-->
-     <module>features/org.eclipse.test-feature</module>
-   </modules>
- 
--- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
+++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
@@ -1,6 +1,7 @@
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml	2021-03-08 19:15:45.372727000 +0100
-@@ -8,12 +8,16 @@
+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 @@
         fileName="eclipse-SDK-${BUILD_ID}-win32-x86_64.zip"></platform>
       <platform
         id="SLG264"
@@ -9,19 +10,25 @@
 +        name="FreeBSD (64 bit version)"
 +        fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform>
       <platform
-+        id="SLG2PPC64BE"
-+        name="FreeBSD (64 bit version for Power PC)"
-+        fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform>
-+      <platform
         id="SLG2PPC64LE"
 -        name="Linux (64 bit version for Power PC)"
 -        fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform>
-+        name="FreeBSD (64 bit little-endian version for Power PC)"
+        name="FreeBSD (64 bit version for Power PC)"
+        fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform>
+       <platform
+        id="SLG2PPC64BE"
+        name="FreeBSD (64 bit version for Power PC LE)"
 +        fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64le.tar.gz"></platform>
+      <platform
+         id="SLG2AARCH64"
+-        name="Linux (64 bit version for AArch64)"
+-        fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-aarch64.tar.gz"></platform>
+        name="FreeBSD (64 bit version for AArch64)"
+        fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-aarch64.tar.gz"></platform>
       <platform
         id="SMCC64"
         name="Mac OSX (64 bit version)"
-@@ -70,12 +74,16 @@
+@@ -71,16 +75,16 @@
         fileName="eclipse-platform-${BUILD_ID}-win32-x86_64.zip"></platform>
       <platform
         id="PLG264"
@@ -30,19 +37,21 @@
 +        name="FreeBSD (64 bit version)"
 +        fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform>
       <platform
-+        id="PLG2PPC64BE"
-+        name="FreeBSD (64 bit version for Power PC)"
-+        fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform>
-+      <platform
         id="PLG2PPC64LE"
 -        name="Linux (64 bit version for Power PC)"
 -        fileName="eclipse-platform-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform>
-+        name="FreeBSD (64 bit little-endian version for Power PC)"
-+        fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64le.tar.gz"></platform>
+        name="FreeBSD (64 bit version for Power PC)"
+        fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform>
+       <platform
+         id="PLG2AARCH64"
+-        name="Linux (64 bit version for AArch64)"
+-        fileName="eclipse-platform-${BUILD_ID}-linux-gtk-aarch64.tar.gz"></platform>
+        name="FreeBSD (64 bit version for AArch64)"
+        fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-aarch64.tar.gz"></platform>
       <platform
         id="PMCC64"
         name="Mac OSX (64 bit version)"
-@@ -150,12 +158,16 @@
+@@ -113,16 +117,16 @@
         fileName="swt-${BUILD_ID}-win32-win32-x86_64.zip"></platform>
       <platform
         id="SWTLG64"
@@ -51,20 +60,23 @@
 +        name="FreeBSD (64 bit version)"
 +        fileName="swt-${BUILD_ID}-gtk-freebsd-amd64.zip"></platform>
       <platform
-+        id="SWTLG2PPC64BE"
-+        name="FreeBSD (64 bit version for Power PC)"
-+        fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64.zip"></platform>
-+      <platform
         id="SWTLG2PPC64LE"
 -        name="Linux (64 bit version for Power PC)"
 -        fileName="swt-${BUILD_ID}-gtk-linux-ppc64le.zip"></platform>
-+        name="FreeBSD (64 bit little-endian version for Power PC)"
-+        fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64le.zip"></platform>
+        name="FreeBSD (64 bit version for Power PC)"
+        fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64.zip"></platform>
+       <platform
+         id="SWTLG2AARCH64"
+-        name="Linux (64 bit version for AArch64)"
+-        fileName="swt-${BUILD_ID}-gtk-linux-aarch64.zip"></platform>
+        name="FreeBSD (64 bit version for AArch64)"
+        fileName="swt-${BUILD_ID}-gtk-freebsd-aarch64.zip"></platform>
       <platform
         id="SWTMCC64"
         name="Mac OSX (64 bit version)"
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml	2021-03-08 19:05:06.948454000 +0100
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -138,9 +138,9 @@
           <resolver>p2</resolver>
           <environments>
@@ -77,22 +89,110 @@
             </environment>
             <environment>
               <os>win32</os>
--- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml	2021-03-08 19:16:10.708519000 +0100
-@@ -14,8 +14,9 @@
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product	0000-00-00 00:00:00.000000000 +0000
+@@ -18,7 +18,7 @@
+    <splash
+       location="org.eclipse.platform" />
+    <launcher name="eclipse">
+-      <linux icon="icons/icon.xpm"/>
+      <freebsd icon="icons/icon.xpm"/>
+       <macosx icon="icons/Eclipse.icns"/>
+       <win useIco="false">
+          <bmp/>
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.sdk.product	0000-00-00 00:00:00.000000000 +0000
+@@ -18,7 +18,7 @@
+    <splash
+       location="org.eclipse.platform" />
+    <launcher name="eclipse">
+-      <linux icon="icons/icon.xpm"/>
+      <freebsd icon="icons/icon.xpm"/>
+       <macosx icon="icons/Eclipse.icns"/>
+       <win useIco="false">
+          <bmp/>
+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 @@
+           <execution>
+             <id>mirror-build</id>
+             <phase>generate-resources</phase>
+<!-- Ignore eclipse-junit-tests artifacts for FreeBSD build
+             <goals>
+               <goal>mirror</goal>
+             </goals>
+-->
+             <configuration>
+               <source>
+                 <!-- source repositories to mirror from -->
+@@ -402,7 +404,7 @@
+             <configuration>
+               <formats>
+                 <win32>zip</win32>
+-                <linux>tar.gz</linux>
+                <freebsd>tar.gz</freebsd>
+                 <macosx>tar.gz</macosx>
+               </formats>
+             </configuration>
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.product	0000-00-00 00:00:00.000000000 +0000
+@@ -16,7 +16,7 @@
+    </launcherArgs>
+ 
+    <launcher name="eclipse">
+-      <linux icon="icons/icon.xpm"/>
+      <freebsd icon="icons/icon.xpm"/>
+       <macosx icon="icons/Eclipse.icns"/>
+       <win useIco="false">
+          <bmp/>
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/rcp.sdk.product	0000-00-00 00:00:00.000000000 +0000
+@@ -18,7 +18,7 @@
+    <windowImages/>
+ 
+    <launcher name="eclipse">
+-      <linux icon="icons/icon.xpm"/>
+      <freebsd icon="icons/icon.xpm"/>
+       <macosx icon="icons/Eclipse.icns"/>
+       <win useIco="false">
+          <bmp/>
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product	0000-00-00 00:00:00.000000000 +0000
+@@ -18,7 +18,7 @@
+    <splash
+       location="org.eclipse.platform" />
+    <launcher name="eclipse">
+-      <linux icon="icons/icon.xpm"/>
+      <freebsd icon="icons/icon.xpm"/>
+       <macosx icon="icons/Eclipse.icns"/>
+       <win useIco="false">
+          <bmp/>
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+--- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -14,9 +14,10 @@
   <target name="equinoxlaunchers">
     <property name="archiveRoot" value="launchers" />
     <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
 -    <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
 -    <buildRepos os="linux" ws="gtk" arch="ppc64le" archiveName="${archiveRoot}-linux.gtk.ppc64le.${buildId}.tar.gz" />
+-  	<buildRepos os="linux" ws="gtk" arch="aarch64" archiveName="${archiveRoot}-linux.gtk.aarch64.${buildId}.tar.gz" />
 +    <buildRepos os="freebsd" ws="gtk" arch="amd64" archiveName="${archiveRoot}-freebsd.gtk.amd64.${buildId}.tar.gz" />
 +    <buildRepos os="freebsd" ws="gtk" arch="powerpc64" archiveName="${archiveRoot}-freebsd.gtk.powerpc64.${buildId}.tar.gz" />
 +    <buildRepos os="freebsd" ws="gtk" arch="powerpc64le" archiveName="${archiveRoot}-freebsd.gtk.powerpc64le.${buildId}.tar.gz" />
+  	<buildRepos os="freebsd" ws="gtk" arch="aarch64" archiveName="${archiveRoot}-freebsd.gtk.aarch64.${buildId}.tar.gz" />
     <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" />
+     <buildRepos os="macosx" ws="cocoa" arch="aarch64" archiveName="${archiveRoot}-macosx.cocoa.aarch64.${buildId}.tar.gz" />
   </target>
- 
--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product	2021-03-08 19:05:06.949169000 +0100
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
+--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product	0000-00-00 00:00:00.000000000 +0000
@@ -18,7 +18,7 @@
    <windowImages/>
 
@@ -100,10 +200,11 @@
 -      <linux icon="icon.xpm"/>
 +      <freebsd icon="icon.xpm"/>
       <macosx icon="rt.icns"/>
-       <win useIco="false">
-          <bmp/>
--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	2021-03-08 19:05:06.949519000 +0100
+       <win useIco="true">
+          <ico path="rt.ico"/>
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -43,9 +43,9 @@
           <resolver>p2</resolver>
           <environments>
@@ -116,7 +217,7 @@
             </environment>
             <environment>
               <os>win32</os>
-@@ -91,7 +91,7 @@
+@@ -97,7 +97,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
@@ -125,65 +226,23 @@
                 <macosx>tar.gz</macosx>
               </formats>
             </configuration>
--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product	2021-03-08 19:05:06.949844000 +0100
-@@ -18,7 +18,7 @@
-    <splash
-       location="org.eclipse.platform" />
-    <launcher name="eclipse">
-      <linux icon="icons/icon.xpm"/>
-+      <freebsd icon="icons/icon.xpm"/>
-       <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="false">
-          <bmp/>
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	2021-03-08 19:05:06.950147000 +0100
-@@ -79,7 +79,7 @@
-             <configuration>
-               <formats>
-                 <win32>zip</win32>
-                <linux>tar.gz</linux>
-+                <freebsd>tar.gz</freebsd>
-                 <macosx>tar.gz</macosx>
-               </formats>
-             </configuration>
--- eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product	2021-03-08 19:05:06.950497000 +0100
-@@ -18,7 +18,7 @@
-    <splash
-       location="org.eclipse.platform" />
-    <launcher name="eclipse">
-      <linux icon="icons/icon.xpm"/>
-+      <freebsd icon="icons/icon.xpm"/>
-       <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="false">
-          <bmp/>
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml	2021-03-08 19:05:06.950798000 +0100
-@@ -36,7 +36,9 @@
-     <module>platform</module>
-     <module>platform.sdk</module>
-     <module>sdk</module>
-+	<!-- disabled
+diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.releng.tychoeclipsebuilder/pom.xml
+--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -31,7 +31,9 @@
+     <module>rcp.config</module>
+     <module>equinox.starterkit.product</module>
+     <module>equinox-sdk</module>
+<!-- disabled
     <module>eclipse-junit-tests</module>
+-->
     <module>eclipse.platform.repository</module>
-+	  -->
   </modules>
 </project>
--- eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product	2021-03-08 19:05:06.951141000 +0100
-@@ -16,7 +16,7 @@
-    </launcherArgs>
- 
-    <launcher name="eclipse">
-      <linux icon="icons/icon.xpm"/>
-+      <freebsd icon="icons/icon.xpm"/>
-       <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="false">
-          <bmp/>
--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	2021-03-08 19:16:52.873764000 +0100
-@@ -29,11 +29,14 @@
+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
+@@ -32,14 +32,17 @@
 #root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe
 #root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe
 
@@ -192,46 +251,18 @@
 +root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64
 +root.freebsd.gtk.powerpc64.permissions.755=eclipse
 
-root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
-root.linux.gtk.x86_64.permissions.755=eclipse
+-root.linux.gtk.aarch64=rootfiles/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
+-root.linux.gtk.aarch64.permissions.755=eclipse
 +root.freebsd.gtk.powerpc64le=rootfiles/freebsd.gtk.powerpc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64le
 +root.freebsd.gtk.powerpc64le.permissions.755=eclipse
+ 
+-root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
+-root.linux.gtk.x86_64.permissions.755=eclipse
+root.freebsd.gtk.aarch64=rootfiles/freebsd.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/aarch64
+root.freebsd.gtk.aarch64.permissions.755=eclipse
 +
-+root.freebsd.gtk.amd64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64
+root.freebsd.gtk.amd64=rootfiles/freebsd.gtk.amd64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64
 +root.freebsd.gtk.amd64.permissions.755=eclipse
 
 bin.includes = feature.properties
 
--- eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product	2021-03-08 19:05:06.951767000 +0100
-@@ -18,7 +18,7 @@
-    <windowImages/>
- 
-    <launcher name="eclipse">
-      <linux icon="icons/icon.xpm"/>
-+      <freebsd icon="icons/icon.xpm"/>
-       <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="false">
-          <bmp/>
--- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml	2021-03-08 19:05:06.952089000 +0100
-@@ -77,7 +77,7 @@
-             <configuration>
-               <formats>
-                 <win32>zip</win32>
-                <linux>tar.gz</linux>
-+                <freebsd>tar.gz</freebsd>
-                 <macosx>tar.gz</macosx>
-               </formats>
-             </configuration>
--- eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product.orig	2020-06-04 12:00:14.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product	2021-03-08 19:05:06.952429000 +0100
-@@ -18,7 +18,7 @@
-    <splash
-       location="org.eclipse.platform" />
-    <launcher name="eclipse">
-      <linux icon="icons/icon.xpm"/>
-+      <freebsd icon="icons/icon.xpm"/>
-       <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="false">
-          <bmp/>
--- a/java/eclipse/files/patch-eclipse.platform.resources
+++ b/java/eclipse/files/patch-eclipse.platform.resources
@@ -1,5 +1,6 @@
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	2021-03-08 20:18:47.266872000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	0000-00-00 00:00:00.000000000 +0000
@@ -20,7 +20,7 @@
 LIB_NAME_FULL = libunixfile_1_0_0.so
 
@@ -28,8 +29,55 @@
 -install: core
 -	rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so
 -	mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project	2021-03-08 20:18:47.267280000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/META-INF/MANIFEST.MF
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+@@ -1,9 +1,9 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %fragmentName
+-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.aarch64;singleton:=true
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.aarch64;singleton:=true
+ Bundle-Version: 1.4.100.qualifier
+ Bundle-Vendor: %providerName
+ Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
+ Bundle-Localization: fragment
+-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=aarch64))
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=aarch64))
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/fragment.properties eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/fragment.properties
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+@@ -11,5 +11,5 @@
+ # Contributors:
+ #     IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Core File System for Linux Aarch64 bit
+fragmentName = Core File System for FreeBSD Aarch64 bit
+ providerName = Eclipse.org
+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 @@
+     <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 @@
+           <resolver>p2</resolver>
+           <environments>
+             <environment>
+-              <os>linux</os>
+              <os>freebsd</os>
+               <ws>gtk</ws>
+               <arch>aarch64</arch>
+             </environment>
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
@@ -38,8 +86,9 @@
 	<comment></comment>
 	<projects>
 	</projects>
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.267678000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
@@ -52,8 +101,19 @@
 Bundle-Localization: fragment
 -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64))
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml	2021-03-08 20:18:47.268150000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/fragment.properties eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/fragment.properties
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+@@ -11,5 +11,5 @@
+ # Contributors:
+ #     IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Core File System for Linux
+fragmentName = Core File System for FreeBSD
+ providerName = Eclipse.org
+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 @@
     <relativePath>../../</relativePath>
   </parent>
@@ -99,8 +159,20 @@
                <include name="libunixfile_*.so"/>
            </fileset>
            </copy>
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.268509000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/.project eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/.project
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/.project	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/.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.filesystem.linux.ppc64le</name>
+	<name>org.eclipse.core.filesystem.freebsd.powerpc64</name>
+ 	<comment></comment>
+ 	<projects>
+ 	</projects>
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
@@ -113,8 +185,19 @@
 Bundle-Localization: fragment
 -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=ppc64le))
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=powerpc64))
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml	2021-03-08 20:18:47.268870000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/fragment.properties eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/fragment.properties
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+@@ -11,5 +11,5 @@
+ # Contributors:
+ #     IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Core File System for Linux PPC 64 LE bit
+fragmentName = Core File System for FreeBSD PPC 64 LE bit
+ providerName = Eclipse.org
+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 @@
     <relativePath>../../</relativePath>
   </parent>
@@ -136,8 +219,20 @@
             </environment>
           </environments>
         </configuration>
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF.orig	2021-03-08 20:20:31.138482000 +0100
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF	2021-03-08 20:20:57.684056000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/.project eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/.project
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/.project	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/.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.filesystem.linux.ppc64le</name>
+	<name>org.eclipse.core.filesystem.freebsd.powerpc64le</name>
+ 	<comment></comment>
+ 	<projects>
+ 	</projects>
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
@@ -150,8 +245,19 @@
 Bundle-Localization: fragment
 -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=ppc64le))
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=powerpc64le))
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml.orig	2021-03-08 20:27:07.595490000 +0100
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml	2021-03-08 20:27:29.452487000 +0100
+diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/fragment.properties eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/fragment.properties
+--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+@@ -11,5 +11,5 @@
+ # Contributors:
+ #     IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Core File System for Linux PPC 64 LE bit
+fragmentName = Core File System for FreeBSD PPC 64 LE bit
+ providerName = Eclipse.org
+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 @@
     <relativePath>../../</relativePath>
   </parent>
@@ -173,22 +279,26 @@
             </environment>
           </environments>
         </configuration>
--- eclipse.platform.resources/pom.xml.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/pom.xml	2021-03-08 20:22:22.387766000 +0100
-@@ -52,8 +52,9 @@
+diff -ru eclipse.platform.resources/pom.xml eclipse.platform.resources/pom.xml
+--- eclipse.platform.resources/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -52,9 +52,10 @@
 
   <modules>
     <module>bundles/org.eclipse.core.filesystem</module>
+-    <module>bundles/org.eclipse.core.filesystem.linux.aarch64</module>
 -    <module>bundles/org.eclipse.core.filesystem.linux.ppc64le</module>
 -    <module>bundles/org.eclipse.core.filesystem.linux.x86_64</module>
+    <module>bundles/org.eclipse.core.filesystem.freebsd.aarch64</module>
 +    <module>bundles/org.eclipse.core.filesystem.freebsd.powerpc64</module>
 +    <module>bundles/org.eclipse.core.filesystem.freebsd.powerpc64le</module>
 +    <module>bundles/org.eclipse.core.filesystem.freebsd.amd64</module>
     <module>bundles/org.eclipse.core.filesystem.macosx</module>
     <module>bundles/org.eclipse.core.filesystem.win32.x86_64</module>
 
--- eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml.orig	2020-05-14 17:23:06.000000000 +0200
-+++ eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml	2021-03-08 20:18:47.269488000 +0100
+diff -ru eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml
+--- eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
@@ -28,9 +28,9 @@
          unpack="false"/-->
 
--- a/java/eclipse/files/patch-eclipse.platform.runtime
+++ b/java/eclipse/files/patch-eclipse.platform.runtime
@@ -2,8 +2,8 @@ diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclip
 --- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	0000-00-00 00:00:00.000000000 +0000
@@ -63,7 +63,7 @@
- 	//XXX This is not synchronized
- 	private Map<Bundle,Log> logs = new HashMap<>(5);
+ 
+ 	private Map<Bundle, Log> logs = new ConcurrentHashMap<>(5);
 
 -	private static final String[] OS_LIST = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
 +	private static final String[] OS_LIST = { Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 };
@@ -13,7 +13,7 @@ diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclip
 diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
 --- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
-@@ -208,6 +208,8 @@
+@@ -206,6 +206,8 @@
 	 */
 	public static final String OS_LINUX = "linux";//$NON-NLS-1$
 
--- a/java/eclipse/files/patch-eclipse.platform.swt
+++ b/java/eclipse/files/patch-eclipse.platform.swt
@@ -1,7 +1,8 @@
--- eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk	2021-03-08 20:18:47.290005000 +0100
-@@ -10,7 +10,7 @@
- 	<classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
+diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk
+--- eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk	0000-00-00 00:00:00.000000000 +0000
+@@ -9,7 +9,7 @@
+ 	<classpathentry kind="src" path="Eclipse SWT/common"/>
 	<classpathentry kind="src" path="Eclipse SWT PI/gtk">
 		<attributes>
 -			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="org.eclipse.swt.gtk.linux.x86_64"/>
@@ -9,8 +10,20 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="Eclipse SWT PI/cairo"/>
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java	2021-03-08 20:18:47.291226000 +0100
+diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java	0000-00-00 00:00:00.000000000 +0000
+@@ -10,7 +10,6 @@
+  *
+  * Contributors:
+  *     IBM Corporation - initial API and implementation
+- *     Christoph Läubrich - Bug 513185
+  *******************************************************************************/
+ package org.eclipse.swt.layout;
+ 
+diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java	0000-00-00 00:00:00.000000000 +0000
@@ -10,7 +10,7 @@
  *
  * Contributors:
@@ -20,12 +33,13 @@
  *******************************************************************************/
 package org.eclipse.swt.widgets;
 
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	2021-03-08 20:18:47.291879000 +0100
-@@ -69,12 +69,12 @@
+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 @@
+ 
 static String arch() {
 	String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
- 	if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
 -	if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$
 	return osArch;
 }
@@ -36,8 +50,9 @@
 	if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$
 	if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$
 	if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2021-03-08 20:31:19.761093000 +0100
+diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	0000-00-00 00:00:00.000000000 +0000
@@ -72,7 +72,7 @@
 
 cd `dirname $0`
@@ -47,7 +62,7 @@
 
 export CFLAGS='-O -Wall -fPIC'
 
-@@ -86,21 +86,14 @@
+@@ -86,27 +86,30 @@
 		MAKEFILE=make_win32.mak
 		;;
 	*)
@@ -70,9 +85,8 @@
 fi
 case $MODEL in
 	"x86_64")
-@@ -111,6 +104,16 @@
- 		SWT_ARCH=x86
- 		AWT_ARCH=i386
+ 		SWT_ARCH=x86_64
+ 		AWT_ARCH=amd64
 		;;
 +	"powerpc" | "powerpc64")
 +		SWT_ARCH=ppc64
@@ -87,7 +101,7 @@
 	*)
 		SWT_ARCH=$MODEL
 		AWT_ARCH=$MODEL
-@@ -118,6 +121,20 @@
+@@ -114,6 +117,13 @@
 esac
 
 case $SWT_OS.$SWT_ARCH in
@@ -98,41 +112,56 @@
 +			export JAVA_HOME
 +		fi
 +		;;
-+	"freebsd.ppc64le")
-+		if [ "${JAVA_HOME}" = "" ]; then
-+			DYNAMIC_JAVA_HOME=`readlink -f /usr/local/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
-+			JAVA_HOME = $DYNAMIC_JAVA_HOME
-+			export JAVA_HOME
-+		fi
-+		;;
- 	"linux.x86")
+ 	"linux.x86_64")
 		if [ "${CC}" = "" ]; then
 			export CC=gcc
-@@ -194,7 +211,7 @@
+@@ -148,7 +158,7 @@
 
 
 # For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
-+if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' ]; then
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
+if [ ${MODEL} = 'amd64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'aarch64' ]; then
 	SWT_PTR_CFLAGS=-DJNI64
 	if [ -d /lib64 ]; then
 		XLIB64=-L/usr/X11R6/lib64
-@@ -205,6 +222,11 @@
- 		XLIB64="${XLIB64} -L/usr/lib64"
+@@ -160,6 +170,11 @@
 		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
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	2021-03-08 20:18:47.292979000 +0100
-@@ -103,16 +103,18 @@
- WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
+ 
+@@ -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
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
 +port_prefix=`pkg-config --variable=prefix gtk+-3.0`
@@ -149,11 +178,11 @@
 +		-I$(JAVA_HOME)/include/freebsd \
 		${SWT_PTR_CFLAGS}
 -LFLAGS = -shared -fPIC ${SWT_LFLAGS}
-+LFLAGS = -shared -fPIC -m64 ${SWT_LFLAGS} -L$(port_prefix)/lib
+LFLAGS = -shared -fPIC ${SWT_LFLAGS} -L$(port_prefix)/lib
 
- ifndef NO_STRIP
- 	# -s = Remove all symbol table and relocation information from the executable.
-@@ -255,10 +257,6 @@
+ # 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.
@@ -164,9 +193,10 @@
 	@# 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)/
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	2021-03-08 20:18:47.294228000 +0100
-@@ -60,8 +60,8 @@
+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
+@@ -65,8 +65,8 @@
 
 		/* Initialize the OS flags and locale constants */
 		String osName = System.getProperty ("os.name");
@@ -177,9 +207,10 @@
 		if (osName.startsWith("Windows")) isWin32 = true;
 		IsLinux = isLinux;  IsWin32 = isWin32;
 
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	2021-03-08 20:18:47.295739000 +0100
-@@ -120,7 +120,7 @@
+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 @@
 	 * 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
 	 */
@@ -188,9 +219,10 @@
 
 	/** Workaround for bug 522733 */
 	static boolean bug522733FirstInstanceCreated = false;
--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2021-03-08 20:32:15.547465000 +0100
-@@ -16,11 +16,16 @@
+diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
+@@ -16,19 +16,19 @@
 requires.3.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
 
 requires.4.namespace = org.eclipse.equinox.p2.iu
@@ -206,14 +238,25 @@
 requires.5.range = [$version$,$version$]
 -requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
 +requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.6.namespace = org.eclipse.equinox.p2.iu
+ 
+ requires.6.namespace = org.eclipse.equinox.p2.iu
+-requires.6.name = org.eclipse.swt.gtk.linux.aarch64
 +requires.6.name = org.eclipse.swt.gtk.freebsd.powerpc64le
-+requires.6.range = [$version$,$version$]
+ requires.6.range = [$version$,$version$]
+-requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
 +requires.6.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64le)(!(org.eclipse.swt.buildtime=true)))
--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	2021-03-08 20:36:54.906169000 +0100
-@@ -63,13 +63,17 @@
+ 
+ requires.7.namespace = org.eclipse.equinox.p2.iu
+ requires.7.name = org.eclipse.swt.cocoa.macosx.aarch64
+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 @@
+ 		</antcall>
+ 		<antcall target="check_fragment_libraries">
+ 			<param name="library_count" value="8"/>
+-			<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"/>
@@ -233,80 +276,331 @@
 			<param name="library_count" value="4"/>
 			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
 		</antcall>
-@@ -80,12 +84,12 @@
+@@ -89,13 +93,13 @@
 		<property name="checkdir" value="~/build/check_libraries"/>
- 		<property name="library_count" value="23"/>
+ 		<property name="library_count" value="34"/>
 		<property name="fragment" value=""/>
-		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
-+		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.gtk.freebsd.powerpc64le/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
- 			<filename regex="[0-9][0-9][0-9][0-9]."/>
- 			<filename regex="${swt_version}."/>
+-		<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/**">
+ 			<filename regex="[0-9][0-9][0-9][0-9]"/>
+ 			<filename regex="${swt_version}"/>
 			<exclude name="**/.git/**"/>
 		</fileset>
-		<fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
-+		<fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.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.*/**">
- 			<filename regex="[0-9][0-9][0-9][0-9]."/>
- 			<filename regex="${swt_version}." negate="true"/>
+ 		<echo>Matched files ${toString:match}</echo>
+-		<fileset id="not_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="not_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/**">
+ 			<filename regex="[0-9][0-9][0-9][0-9]"/>
+ 			<filename regex="${swt_version}" negate="true"/>
 			<exclude name="**/.git/**"/>
-@@ -115,14 +119,22 @@
- 			trust="true"
- 			outputproperty="m_linux_x86_64_output"
- 			command="hostname"/>
-		<sshexec host="${m_linux_ppc64le}"
-+		<sshexec host="${m_linux_powerpc64}"
- 			port="2256"
- 			username="swtbuild"
- 			keyfile="${keyfile}"
- 			failonerror="false"
- 			trust="true"
-			outputproperty="m_linux_ppc64le_output"
-+			outputproperty="m_linux_powerpc64_output"
- 			command="hostname"/>
-+		<sshexec host="${m_linux_powerpc64le}"
-+			port="2256"
-+			username="swtbuild"
-+			keyfile="${keyfile}"
-+			failonerror="false"
-+			trust="true"
-+			outputproperty="m_linux_powerpc64le_output"
-+			command="hostname"/>
- 		<sshexec host="${m_mac}"
- 			username="swtbuild"
- 			keyfile="${keyfile}"
-@@ -139,10 +151,16 @@
- 				<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/>
- 			</and>
+@@ -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>
-		<condition property="m_linux_ppc64le_test" value="${success_msg}" else="${fail_msg}">
-+		<condition property="m_linux_powerpc64_test" value="${success_msg}" else="${fail_msg}">
- 			<and>
-				<length string="${m_linux_ppc64le_output}" when="greater" length="0"/>
-				<matches pattern="x${m_linux_ppc64le_output}*" string="x${m_linux_ppc64le}"/>
-+				<length string="${m_linux_powerpc64_output}" when="greater" length="0"/>
-+				<matches pattern="x${m_linux_powerpc64_output}*" string="x${m_linux_powerpc64}"/>
-+			</and>
-+		</condition>
-+		<condition property="m_linux_powerpc64le_test" value="${success_msg}" else="${fail_msg}">
-+			<and>
-+				<length string="${m_linux_powerpc64le_output}" when="greater" length="0"/>
-+				<matches pattern="x${m_linux_powerpc64le_output}*" string="x${m_linux_powerpc64le}"/>
- 			</and>
- 		</condition>
- 		<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">
--- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup	2021-03-08 20:37:08.379254000 +0100
-@@ -103,7 +103,7 @@
+-		<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 @@
               xsi:type="predicates:NotPredicate">
             <operand
                 xsi:type="predicates:NamePredicate"
 -                pattern=".*(cocoa|gtk|win32)(\.(macosx|aix|hpux|linux|solaris|win32)(\.(x86_64|ppc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/>
-+                pattern=".*(cocoa|gtk|win32)(\.(freebsd|macosx|aix|hpux|linux|solaris|win32)(\.(amd64|x86_64|powerpc64|powerpc64le|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/>
+                pattern=".*(cocoa|gtk|win32)(\.(freebsd|macosx|aix|hpux|linux|solaris|win32)(\.(amd64|x86_64|powerpc64|ia64|aarch64|arm|ppc64|powerpc64le|s390|s390x|x86|sparcv9))?)?"/>
           </operand>
           <operand
               xsi:type="predicates:NamePredicate"
--- eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf	2021-03-08 20:37:33.844415000 +0100
-@@ -10,11 +10,16 @@
+diff -ru eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
+--- eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
+@@ -10,19 +10,19 @@
 requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64))
 
 requires.3.namespace = org.eclipse.equinox.p2.iu
@@ -322,13 +616,19 @@
 requires.4.range = 0.0.0
 -requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le))
 +requires.4.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64))
-+
-+requires.5.namespace = org.eclipse.equinox.p2.iu
+ 
+ requires.5.namespace = org.eclipse.equinox.p2.iu
+-requires.5.name = org.eclipse.swt.gtk.linux.aarch64
 +requires.5.name = org.eclipse.swt.gtk.freebsd.powerpc64le
-+requires.5.range = 0.0.0
+ requires.5.range = 0.0.0
+-requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64))
 +requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64le))
--- eclipse.platform.swt/pom.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/pom.xml	2021-03-08 20:18:47.297968000 +0100
+ 
+ requires.6.namespace = org.eclipse.equinox.p2.iu
+ requires.6.name = org.eclipse.swt.cocoa.macosx.aarch64
+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 @@
       <activation>
         <os>
@@ -353,8 +653,9 @@
     <module>features/org.eclipse.swt.tools.feature</module>
   </modules>
 </project>
--- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml	2021-03-08 20:38:27.083939000 +0100
+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>
 
@@ -369,7 +670,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-@@ -31,10 +31,21 @@
+@@ -31,10 +31,10 @@
          unpack="false"/>
 
    <plugin
@@ -380,17 +681,6 @@
          ws="gtk"
 -         arch="ppc64le"
 +         arch="powerpc64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.swt.gtk.freebsd.powerpc64le"
-+         os="freebsd"
-+         ws="gtk"
-+         arch="powerpc64le"
          download-size="0"
          install-size="0"
          version="0.0.0"
--- a/java/eclipse/files/patch-eclipse.platform.swt.binaries
+++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries
@@ -1,12 +1,110 @@
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.307541000 +0100
+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
@@ -2,7 +2,7 @@
- Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+ Fragment-Host: org.eclipse.swt;bundle-version="[3.116.0,4.0.0)"
 Bundle-Name: %fragmentName
 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.114.100.qualifier
+ Bundle-Version: 3.117.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -21,8 +119,9 @@
 SWT-Arch: aarch64
 -Automatic-Module-Name: org.eclipse.swt.gtk.linux.aarch64
 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.aarch64
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml	2021-03-08 20:18:47.307863000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml	0000-00-00 00:00:00.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 -<project name="org.eclipse.swt.gtk.linux.aarch64" default="build.jars" basedir=".">
@@ -34,15 +133,16 @@
 	<property name="swt.arch" value="aarch64" />
 	<property name="targets" value="install"/>
 	
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml	2021-03-08 20:18:47.308240000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -20,12 +20,12 @@
     <relativePath>../binaries-parent/</relativePath>
   </parent>
   <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.aarch64</artifactId>
-   <version>3.114.100-SNAPSHOT</version>
+   <version>3.117.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -51,7 +151,7 @@
     <ws>gtk</ws>
     <arch>aarch64</arch>
     <buildid>${buildId}</buildid>
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
         <property>
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
           <name>native</name>
@@ -60,8 +160,9 @@
         </property>
       </activation>
       <build>
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project	2021-03-08 20:18:47.308571000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
@@ -70,15 +171,16 @@
 	<comment></comment>
 	<projects>
 	</projects>
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.308897000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,7 +2,7 @@
- Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+ Fragment-Host: org.eclipse.swt;bundle-version="[3.116.0,4.0.0)"
 Bundle-Name: %fragmentName
 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.114.100.qualifier
+ Bundle-Version: 3.117.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -94,8 +196,9 @@
 +SWT-OS: freebsd
 +SWT-Arch: amd64
 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.amd64
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml	2021-03-08 20:18:47.309197000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 -<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir=".">
@@ -109,8 +212,9 @@
 	<property name="targets" value="install"/>
 	
 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh	2021-03-08 20:18:47.309511000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh	0000-00-00 00:00:00.000000000 +0000
@@ -36,10 +36,10 @@
 
 if [ "${DEV_ECLIPSE}" != "" ]; then
@@ -125,15 +229,16 @@
 else
 	echo "Note:" 
 	echo "  Set DEV_ECLIPSE to your development eclipse folder to have the *.jar files copied into it automatically."
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml	2021-03-08 20:18:47.309862000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.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.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
-   <version>3.114.100-SNAPSHOT</version>
+   <version>3.117.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -145,7 +250,7 @@
     <buildid>${buildId}</buildid>
   </properties>
 
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
         <property>
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
           <name>native</name>
@@ -154,15 +259,16 @@
         </property>
       </activation>
       <build>
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.310191000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,7 +2,7 @@
- Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+ Fragment-Host: org.eclipse.swt;bundle-version="[3.116.0,4.0.0)"
 Bundle-Name: %fragmentName
 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.114.100.qualifier
+ Bundle-Version: 3.117.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -178,8 +284,9 @@
 +SWT-OS: freebsd
 +SWT-Arch: powerpc64
 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.powerpc64
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml	2021-03-08 20:18:47.310494000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 -<project name="org.eclipse.swt.gtk.linux.ppc64le" default="build.jars" basedir=".">
@@ -193,15 +300,16 @@
 	<property name="targets" value="install"/>
 	
 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml	2021-03-08 20:18:47.310862000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/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.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
-   <version>3.114.100-SNAPSHOT</version>
+   <version>3.117.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -213,7 +321,7 @@
     <buildid>${buildId}</buildid>
   </properties>
 
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
         <property>
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
           <name>native</name>
@@ -222,15 +330,16 @@
         </property>
       </activation>
       <build>
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF.orig	2021-03-08 20:45:12.925805000 +0100
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF	2021-03-08 20:45:58.878270000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,7 +2,7 @@
- Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+ Fragment-Host: org.eclipse.swt;bundle-version="[3.116.0,4.0.0)"
 Bundle-Name: %fragmentName
 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.114.100.qualifier
+ Bundle-Version: 3.117.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -246,8 +355,9 @@
 +SWT-OS: freebsd
 +SWT-Arch: powerpc64le
 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.powerpc64le
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml.orig	2021-03-08 20:46:24.538852000 +0100
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml	2021-03-08 20:46:47.697856000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 -<project name="org.eclipse.swt.gtk.linux.ppc64le" default="build.jars" basedir=".">
@@ -261,15 +371,16 @@
 	<property name="targets" value="install"/>
 	
 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/pom.xml.orig	2021-03-08 20:47:06.200163000 +0100
-+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/pom.xml	2021-03-08 20:47:32.469033000 +0100
+diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/pom.xml
+--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/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.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64le</artifactId>
-   <version>3.114.100-SNAPSHOT</version>
+   <version>3.117.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -281,7 +392,7 @@
     <buildid>${buildId}</buildid>
   </properties>
 
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
         <property>
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
           <name>native</name>
@@ -290,17 +401,24 @@
         </property>
       </activation>
       <build>
--- eclipse.platform.swt.binaries/pom.xml.orig	2020-06-04 11:51:28.000000000 +0200
-+++ eclipse.platform.swt.binaries/pom.xml	2021-03-08 20:47:55.910881000 +0100
-@@ -54,8 +54,9 @@
- 
+diff -ru eclipse.platform.swt.binaries/pom.xml eclipse.platform.swt.binaries/pom.xml
+--- eclipse.platform.swt.binaries/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -55,12 +55,13 @@
   <modules>
     <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
+     <module>bundles/org.eclipse.swt.cocoa.macosx.aarch64</module>
+-    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
 -    <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
 -    <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
+    <module>bundles/org.eclipse.swt.gtk.freebsd.aarch64</module>
 +    <module>bundles/org.eclipse.swt.gtk.freebsd.powerpc64</module>
 +    <module>bundles/org.eclipse.swt.gtk.freebsd.powerpc64le</module>
 +    <module>bundles/org.eclipse.swt.gtk.freebsd.amd64</module>
     <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
+     <!--module>bundles/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64</module>
+-    <module>bundles/org.eclipse.swt.browser.chromium.gtk.linux.x86_64</module>
+    <module>bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64</module>
+     <module>bundles/org.eclipse.swt.browser.chromium.win32.win32.x86_64</module-->
   </modules>
 
--- a/java/eclipse/files/patch-eclipse.platform.team
+++ b/java/eclipse/files/patch-eclipse.platform.team
@@ -1,33 +1,101 @@
-diff -ru eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile
--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile	0000-00-00 00:00:00.000000000 +0000
-@@ -22,7 +22,7 @@
- LIB_NAME = gnomeproxy.so
- LIB_NAME_FULL = libgnomeproxy-1.0.0.so
- 
-OS_TYPE = linux
-+OS_TYPE = freebsd
- JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
- INCLUDE = `pkg-config --cflags gio-2.0`
- COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT}
-@@ -34,15 +34,13 @@
- 
- compile:
- 	@echo "Building file: $(GNOMEPROXY.O)"
-	@echo "Invoking: GCC C Compiler"
-	gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
-+	$(CC) $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
- 	@echo "Finished building: $(GNOMEPROXY.O)"
- 	@echo " "
- 
- link: compile
- 	@echo "Building target: $(LIB_NAME_FULL)"
-	@echo "Invoking: GCC C Linker"
-	gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
-+	$(CC) $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O)
- 	@echo "Finished building target: $(LIB_NAME_FULL)"
- 	@echo " "
+diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/.project eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/.project
+--- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/.project	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/.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</name>
+	<name>org.eclipse.core.net.freebsd</name>
+ 	<comment></comment>
+ 	<projects>
+ 	</projects>
+diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/META-INF/MANIFEST.MF eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/META-INF/MANIFEST.MF
+--- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+@@ -3,10 +3,10 @@
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+ 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
+ Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
+-Eclipse-PlatformFilter: (osgi.os=linux)
+Eclipse-PlatformFilter: (osgi.os=freebsd)
+ Bundle-RequiredExecutionEnvironment: JavaSE-11
+-Automatic-Module-Name: org.eclipse.core.net.linux
+Automatic-Module-Name: org.eclipse.core.net.freebsd
+ Require-Bundle: com.sun.jna
+diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/fragment.properties eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/fragment.properties
+--- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/fragment.properties	0000-00-00 00:00:00.000000000 +0000
+@@ -11,5 +11,5 @@
+ # Contributors:
+ #     Red Hat Inc. - initial API and implementation
+ ###############################################################################
+-fragmentName = Proxy for Linux
+fragmentName = Proxy for FreeBSD
+ providerName = Eclipse.org
+diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/pom.xml eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/pom.xml
+--- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -8,7 +8,7 @@
+  
+   Contributors:
+      Igor Fedorenko - initial implementation
+-     Red Hat Inc. - modified for use in org.eclipse.core.net.linux
+     Red Hat Inc. - modified for use in org.eclipse.core.net.freebsd
+ -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+@@ -19,7 +19,7 @@
+     <relativePath>../../</relativePath>
+   </parent>
+   <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>
+   <packaging>eclipse-plugin</packaging>
 
+@@ -35,7 +35,7 @@
+         <configuration>
+           <environments>
+             <environment>
+-              <os>linux</os>
+              <os>freebsd</os>
+               <ws>gtk</ws>
+             </environment>
+           </environments>
+diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/src/org/eclipse/core/net/ProxyProvider.java eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/src/org/eclipse/core/net/ProxyProvider.java
+--- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/src/org/eclipse/core/net/ProxyProvider.java	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/src/org/eclipse/core/net/ProxyProvider.java	0000-00-00 00:00:00.000000000 +0000
+@@ -85,7 +85,7 @@
+ 			proxies = getProxyData();
+ 		}
+ 		if (Policy.DEBUG) {
+-			Policy.debug("LinuxProxyProvider#select result for [" + uri + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+			Policy.debug("FreeBSDProxyProvider#select result for [" + uri + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+ 			for (IProxyData proxy : proxies) {
+ 				System.out.println("	" + proxy); //$NON-NLS-1$
+ 			}
+@@ -196,7 +196,7 @@
+ 					pd.setUserid(user);
+ 					pd.setPassword(password);
+ 				}
+-				pd.setSource("LINUX_ENV"); //$NON-NLS-1$
+				pd.setSource("FREEBSD_ENV"); //$NON-NLS-1$
+ 				if (Policy.DEBUG_SYSTEM_PROVIDERS)
+ 					Policy.debug("Got Env proxy: " + pd); //$NON-NLS-1$
+ 				return pd;
+@@ -213,7 +213,7 @@
+ 				if (pd != null) {
+ 					if (Policy.DEBUG_SYSTEM_PROVIDERS)
+ 						Policy.debug("Got Gnome proxy: " + pd); //$NON-NLS-1$
+-					pd.setSource("LINUX_GNOME"); //$NON-NLS-1$
+					pd.setSource("FREEBSD_GNOME"); //$NON-NLS-1$
+ 					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
@@ -68,13 +136,30 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-I
 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.400.qualifier
+ 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
@@ -84,50 +169,19 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xm
   <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.400-SNAPSHOT</version>
+   <version>1.2.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-@@ -34,9 +34,9 @@
-         <configuration>
-           <environments>
-             <environment>
-              <os>linux</os>
-+              <os>freebsd</os>
-               <ws>gtk</ws>
-              <arch>x86_64</arch>
-+              <arch>amd64</arch>
-             </environment>
-           </environments>
-         </configuration>
-@@ -51,7 +51,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>
-@@ -64,9 +64,9 @@
-                 <phase>process-resources</phase>
-                 <configuration>
-                   <target>
-                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.net/natives/unix/linux/"/>
-+                    <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.net/natives/unix/freebsd/"/>
-                     <copy todir=".">
-                      <fileset dir="../org.eclipse.core.net/natives/unix/linux/">
-+                      <fileset dir="../org.eclipse.core.net/natives/unix/freebsd/">
-                         <include name="libgnomeproxy-*.so"/>
-                       </fileset>
-                     </copy>
 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
-@@ -74,7 +74,7 @@
+@@ -73,8 +73,8 @@
     <module>features/org.eclipse.cvs-feature</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.x86_64</module>
     <module>tests</module>
--- 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
-@@ -1298,7 +1298,7 @@
+@@ -1312,7 +1312,7 @@
             %blockSelectionModeFont.description
          </description>
          <fontValue
--- a/java/eclipse/files/patch-eclipse.platform.ua
+++ b/java/eclipse/files/patch-eclipse.platform.ua
@@ -43,14 +43,15 @@ diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal
 diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
 --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java	0000-00-00 00:00:00.000000000 +0000
-@@ -103,6 +103,7 @@
+@@ -95,7 +95,7 @@
+ 		if (defaultBrowserDesc == null) {
+ 			if (Constants.WS_WIN32.equalsIgnoreCase(os)) {
 				setDefaultBrowserID(BROWSER_ID_SYSTEM);
- 			} else if (Constants.OS_AIX.equalsIgnoreCase(os)
- 					|| (Constants.OS_HPUX.equalsIgnoreCase(os))
-+					|| (Constants.OS_FREEBSD.equalsIgnoreCase(os))
- 					|| (Constants.OS_LINUX.equalsIgnoreCase(os))
- 					|| (Constants.OS_SOLARIS.equalsIgnoreCase(os))) {
- 				setDefaultBrowserID(BROWSER_ID_MOZILLA);
+-			} else if (Constants.OS_LINUX.equalsIgnoreCase(os)) {
+			} else if (Constants.OS_LINUX.equalsIgnoreCase(os) || Constants.OS_FREEBSD.equalsIgnoreCase(os)) {
+ 				setDefaultBrowserID(BROWSER_ID_FIREFOX);
+ 			} else if (Constants.OS_MACOSX.equalsIgnoreCase(os)) {
+ 				setDefaultBrowserID(BROWSER_ID_MAC_SYSTEM);
 diff -ru eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java
 --- eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java	0000-00-00 00:00:00.000000000 +0000
--- a/java/eclipse/files/patch-eclipse.platform.ui
+++ b/java/eclipse/files/patch-eclipse.platform.ui
@@ -1,5 +1,6 @@
--- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	2021-03-08 20:18:47.351392000 +0100
+diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml
+--- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -33,9 +33,9 @@
           <resolver>p2</resolver>
           <environments>
@@ -12,8 +13,9 @@
             </environment>
           </environments>
         </configuration>
--- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	2021-03-08 20:18:47.351814000 +0100
+diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml
+--- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	0000-00-00 00:00:00.000000000 +0000
@@ -94,7 +94,7 @@
       <browser
          id="org.eclipse.ui.browser.firefox"
@@ -56,9 +58,10 @@
          executable="epiphany">
          <location>
          	usr/bin/epiphany
--- eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java	2021-03-08 20:18:47.352410000 +0100
-@@ -210,7 +210,8 @@
+diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java
+--- eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java	0000-00-00 00:00:00.000000000 +0000
+@@ -209,7 +209,8 @@
 				if (currentTitleControl.getVisible()) {
 					int tw = width - HMARGIN * 2 - SPACING * 2;
 					String os = System.getProperty("os.name"); //$NON-NLS-1$
@@ -68,15 +71,16 @@
 						tw += 1; // See Bug 342610
 					}
 					if (bsize != null)
-@@ -584,4 +585,4 @@
+@@ -577,4 +578,4 @@
 		target.setTransfer(transferTypes);
 		target.addDropListener(listener);
 	}
 -}
 \ No newline at end of file
 +}
--- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml	2021-03-08 20:18:47.352793000 +0100
+diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml
+--- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml	0000-00-00 00:00:00.000000000 +0000
@@ -12,7 +12,7 @@
         basestylesheeturi="css/e4-dark_linux.css"
         id="org.eclipse.e4.ui.css.theme.e4_dark"
@@ -95,8 +99,9 @@
       </theme>
       <theme
             basestylesheeturi="css/e4_default_mac.css"
--- eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	2021-03-08 20:18:47.353114000 +0100
+diff -ru eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java
+--- eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	0000-00-00 00:00:00.000000000 +0000
@@ -33,6 +33,8 @@
 	 * @return an instance of IOperatingSystemRegistration
 	 */
@@ -106,9 +111,10 @@
 		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
 			return new RegistrationMacOsX();
 		} else if (Platform.OS_LINUX.equals(Platform.getOS())) {
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2021-03-08 20:55:41.125354000 +0100
-@@ -403,26 +403,36 @@
+diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -406,19 +406,29 @@
          fragment="true"/>
 
    <plugin
@@ -125,33 +131,39 @@
          fragment="true"/>
 
    <plugin
-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
+-         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
 -         os="linux"
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le"
 +         os="freebsd"
          ws="gtk"
-         arch="x86_64"
 +         arch="powerpc64le"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          fragment="true"/>
- 
-    <plugin
-+         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
-+         os="freebsd"
-+         ws="gtk"
-+         arch="amd64"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"/>
 +
 +   <plugin
-          id="org.eclipse.equinox.launcher.win32.win32.x86_64"
-          os="win32"
-          ws="win32"
-@@ -451,10 +461,10 @@
+         id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64"
+         os="freebsd"
+         ws="gtk"
+          arch="aarch64"
+          download-size="0"
+          install-size="0"
+@@ -426,10 +436,10 @@
+          fragment="true"/>
+ 
+    <plugin
+-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
+-         os="linux"
+         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
+         os="freebsd"
+          ws="gtk"
+-         arch="x86_64"
+         arch="amd64"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+@@ -464,10 +474,10 @@
          unpack="false"/>
 
    <plugin
@@ -165,16 +177,15 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-@@ -462,10 +472,21 @@
+@@ -475,9 +485,20 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.gtk.linux.x86_64"
+-         id="org.eclipse.swt.gtk.linux.aarch64"
 -         os="linux"
 +         id="org.eclipse.swt.gtk.freebsd.powerpc64le"
 +         os="freebsd"
          ws="gtk"
-         arch="x86_64"
 +         arch="powerpc64le"
 +         download-size="0"
 +         install-size="0"
@@ -183,23 +194,39 @@
 +         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.swt.gtk.freebsd.amd64"
+         id="org.eclipse.swt.gtk.freebsd.aarch64"
 +         os="freebsd"
 +         ws="gtk"
+          arch="aarch64"
+          download-size="0"
+          install-size="0"
+@@ -486,10 +507,10 @@
+          unpack="false"/>
+ 
+    <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"
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2021-03-08 20:56:25.872460000 +0100
-@@ -39,8 +39,9 @@
-                 <plugin id="javax.xml"/>
+diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -39,9 +39,10 @@
                 <plugin id="org.eclipse.swt"/>
                 <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
+                 <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.aarch64"/>
 -                <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/>
+-                <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64"/>
 -                <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le"/>
+                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"/>
                 <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
               </excludes>
--- a/java/eclipse/files/patch-rt.equinox.bundles
+++ b/java/eclipse/files/patch-rt.equinox.bundles
@@ -5,11 +5,54 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFE
  org.eclipse.equinox.internal.security.credentials;x-internal:=true,
  org.eclipse.equinox.internal.security.storage;x-internal:=true,
  org.eclipse.equinox.internal.security.storage.friends;version="1.0.0";x-friends:="org.eclipse.equinox.security.ui",
- org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.linux.x86_64",
-+ org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.freebsd.amd64",
+- org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.linux",
+ org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.freebsd",
  org.eclipse.equinox.security.auth;version="1.0.0",
  org.eclipse.equinox.security.auth.credentials;version="1.0.0",
  org.eclipse.equinox.security.auth.module;version="1.0.0",
+diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+@@ -1,14 +1,14 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %fragmentName
+-Bundle-SymbolicName: org.eclipse.equinox.security.linux;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.security.freebsd;singleton:=true
+ Bundle-Version: 1.0.200.qualifier
+ Bundle-Vendor: %providerName
+ Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
+ Bundle-RequiredExecutionEnvironment: JavaSE-11
+ Bundle-Localization: fragment
+-Eclipse-PlatformFilter: (osgi.os=linux)
+-Export-Package: org.eclipse.equinox.internal.security.linux;x-internal:=true
+-Automatic-Module-Name: org.eclipse.equinox.security.linux
+Eclipse-PlatformFilter: (osgi.os=freebsd)
+Export-Package: org.eclipse.equinox.internal.security.freebsd;x-internal:=true
+Automatic-Module-Name: org.eclipse.equinox.security.freebsd
+ Eclipse-BundleShape: dir
+ Require-Bundle: com.sun.jna;bundle-version="5.8.0"
+diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/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</artifactId>
+  <artifactId>org.eclipse.equinox.security.freebsd</artifactId>
+   <version>1.0.200-SNAPSHOT</version>
+   <packaging>eclipse-plugin</packaging>
+ 
+@@ -32,7 +32,7 @@
+           <resolver>p2</resolver>
+           <environments>
+             <environment>
+-              <os>linux</os>
+              <os>freebsd</os>
+               <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
@@ -24,112 +67,42 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.
 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,13 +1,13 @@
+@@ -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.300.qualifier
+ 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))
-Export-Package: org.eclipse.equinox.internal.security.linux;x-internal:=true
 -Automatic-Module-Name: org.eclipse.equinox.security.linux.x86_64
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64))
-+Export-Package: org.eclipse.equinox.internal.security.freebsd;x-internal:=true
 +Automatic-Module-Name: org.eclipse.equinox.security.freebsd.amd64
 Eclipse-BundleShape: dir
-diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile
--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile	0000-00-00 00:00:00.000000000 +0000
-@@ -1,7 +1,7 @@
- LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1`
- LIBSECRET_LIBS = `pkg-config --libs libsecret-1`
- 
-CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS)
-+CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd" $(LIBSECRET_CFLAGS)
- LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS)
- 
- all: ../libkeystorelinuxnative.so
-@@ -10,7 +10,7 @@
- 	rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o
- 
- ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
-	$(CC) $(LDFLAGS) -o $@ $<
-+	$(CC) $(LDFLAGS) -s -o $@ $<
- 
- ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
- 	$(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c
+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
-@@ -18,7 +18,7 @@
+@@ -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.300-SNAPSHOT</version>
+   <version>1.1.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-@@ -35,9 +35,9 @@
-           <resolver>p2</resolver>
-           <environments>
-             <environment>
-              <os>linux</os>
-+              <os>freebsd</os>
-               <ws>gtk</ws>
-              <arch>x86_64</arch>
-+              <arch>amd64</arch>
-             </environment>
-           </environments>
-         </configuration>
-@@ -51,7 +51,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>
-@@ -64,7 +64,7 @@
-                 <phase>process-resources</phase>
-                 <configuration>
-                   <target>
-                    <exec executable="make" newenvironment="false" dir="keystorelinuxnative/"/>
-+                    <exec executable="gmake" newenvironment="false" dir="keystorelinuxnative/"/>
-                   </target>
-                 </configuration>
-                 <goals>
-diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties
--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties	0000-00-00 00:00:00.000000000 +0000
-@@ -12,7 +12,7 @@
- #     Julien HENRY - Linux implementation
- ###############################################################################
- 
-## Linux libsecure integration module
-+## FreeBSD libsecure integration module
- getMasterPasswordError=Secure storage was unable to retrieve the master password from the password storage. If secure storage was created using a different user account, you'll have to switch back to that account. Alternatively, you can use the password recovery, or delete and re-create secure storage. 
- saveMasterPasswordError=Secure storage was unable to save the master password.
-newMasterPasswordGenerated=New secure storage master password was generated (Linux libsecret integration module). 
-+newMasterPasswordGenerated=New secure storage master password was generated (FreeBSD libsecret integration module). 
-diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties
--- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties	0000-00-00 00:00:00.000000000 +0000
-@@ -29,7 +29,7 @@
- generate.plugin@org.eclipse.osgi.source=org.eclipse.osgi
- generate.plugin@org.eclipse.osgi.util.source=org.eclipse.osgi.util
- generate.plugin@org.eclipse.equinox.security.win32.x86_64.source=org.eclipse.equinox.security.win32.x86_64
-generate.plugin@org.eclipse.equinox.security.linux.x86_64.source=org.eclipse.equinox.security.linux.x86_64
-+generate.plugin@org.eclipse.equinox.security.freebsd.amd64.source=org.eclipse.equinox.security.freebsd.amd64
- generate.plugin@org.eclipse.equinox.security.macosx.source=org.eclipse.equinox.security.macosx
- generate.plugin@org.eclipse.equinox.security.source=org.eclipse.equinox.security
- generate.plugin@org.eclipse.equinox.security.ui.source=org.eclipse.equinox.security.ui
 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
@@ -137,10 +110,10 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt
          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"
@@ -150,10 +123,10 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.security.linux.x86_64.source"
+-         id="org.eclipse.equinox.security.linux.source"
 -         os="linux"
 -         arch="x86_64"
-+         id="org.eclipse.equinox.security.freebsd.amd64.source"
+         id="org.eclipse.equinox.security.freebsd.source"
 +         os="freebsd"
 +         arch="amd64"
          download-size="0"
@@ -162,11 +135,13 @@ 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,7 +84,7 @@
+@@ -84,8 +84,8 @@
     <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>
--- a/java/eclipse/files/patch-rt.equinox.framework
+++ b/java/eclipse/files/patch-rt.equinox.framework
@@ -1,27 +1,29 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.376563000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 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.1.1200.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
+ Bundle-Version: 1.2.300.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
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64))
 +Bundle-Localization: launcher.gtk.freebsd.aarch64
 Eclipse-BundleShape: dir
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml	2021-03-08 20:18:47.376862000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -18,12 +18,12 @@
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
   <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.1.1200-SNAPSHOT</version>
+   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -30,8 +32,9 @@
     <ws>gtk</ws>
     <arch>aarch64</arch>
     <skipAPIAnalysis>true</skipAPIAnalysis>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	2021-03-08 20:18:47.377168000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
@@ -40,23 +43,25 @@
 	<comment></comment>
 	<projects>
 	</projects>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.377471000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 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.1.1200.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
+ Bundle-Version: 1.2.300.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
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
 +Bundle-Localization: launcher.gtk.freebsd.amd64
 Eclipse-BundleShape: dir
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties	2021-03-08 20:18:47.377766000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties	0000-00-00 00:00:00.000000000 +0000
@@ -11,5 +11,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -64,15 +69,16 @@
 -pluginName = Equinox Launcher Linux X86_64 Fragment
 +pluginName = Equinox Launcher FreeBSD/amd64 Fragment
 providerName = Eclipse.org - Equinox
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	2021-03-08 20:18:47.378067000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -18,14 +18,14 @@
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
   <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.1.1200-SNAPSHOT</version>
+   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -84,8 +90,9 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 </project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project	2021-03-08 20:18:47.378338000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project	0000-00-00 00:00:00.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
@@ -94,30 +101,32 @@
 	<comment></comment>
 	<projects>
 	</projects>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	2021-03-08 20:18:47.378618000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 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.1.1200.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
+ Bundle-Version: 1.2.300.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
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64))
 +Bundle-Localization: launcher.gtk.freebsd.powerpc64
 Eclipse-BundleShape: dir
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	2021-03-08 20:18:47.378921000 +0100
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -18,14 +18,14 @@
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
   <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.1.1200-SNAPSHOT</version>
+   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
@@ -129,9 +138,47 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 </project>
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2021-03-08 21:03:17.665874000 +0100
-@@ -24,11 +24,14 @@
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+@@ -2,9 +2,9 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %pluginName
+ 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
+ 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
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64le))
+Bundle-Localization: launcher.gtk.freebsd.powerpc64le
+ Eclipse-BundleShape: dir
+diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -18,14 +18,14 @@
+     <relativePath>../../launcher-binary-parent</relativePath>
+   </parent>
+   <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>
+   <packaging>eclipse-plugin</packaging>
+ 
+   <properties>
+-    <os>linux</os>
+    <os>freebsd</os>
+     <ws>gtk</ws>
+-    <arch>ppc64le</arch>
+    <arch>powerpc64le</arch>
+     <skipAPIAnalysis>true</skipAPIAnalysis>
+   </properties>
+ </project>
+diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
+@@ -24,17 +24,20 @@
 root.win32.win32.x86_64=bin/win32/win32/x86_64
 root.win32.win32.x86_64.permissions.755=launcher.exe
 
@@ -140,19 +187,28 @@
 +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root
 +root.freebsd.gtk.powerpc64.permissions.755=launcher
 
+-root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+-root.linux.gtk.aarch64.permissions.755=launcher
 +root.freebsd.gtk.powerpc64le=bin/gtk/freebsd/powerpc64le,gtk_root
 +root.freebsd.gtk.powerpc64le.permissions.755=launcher
+ 
+root.freebsd.gtk.aarch64=bin/gtk/freebsd/aarch64,gtk_root
+root.freebsd.gtk.aarch64.permissions.755=launcher
 +
 root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher
 
+ root.macosx.cocoa.aarch64=bin/cocoa/macosx/aarch64
+ root.macosx.cocoa.aarch64.permissions.755=Eclipse.app/Contents/MacOS/launcher
+ 
 -root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
 -root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
 +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
 +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml	2021-03-08 21:03:42.443880000 +0100
-@@ -33,20 +33,30 @@
+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 @@
          fragment="true"/>
 
    <plugin
@@ -167,14 +223,14 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
- 
+-         
+
    <plugin
-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
+-         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
 -         os="linux"
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le"
 +         os="freebsd"
          ws="gtk"
-         arch="x86_64"
 +         arch="powerpc64le"
 +         download-size="0"
 +         install-size="0"
@@ -182,15 +238,43 @@
 +         fragment="true"/>
 +
 +   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
+         id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64"
 +         os="freebsd"
 +         ws="gtk"
+          arch="aarch64"
+          download-size="0"
+          install-size="0"
+@@ -73,10 +83,10 @@
+          fragment="true"/>
+ 
+    <plugin
+-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
+-         os="linux"
+         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
+         os="freebsd"
+          ws="gtk"
+-         arch="x86_64"
 +         arch="amd64"
          download-size="0"
          install-size="0"
          version="0.0.0"
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2021-03-08 20:18:47.379966000 +0100
+diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/eclipse.c rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/eclipse.c
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/eclipse.c	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/eclipse.c	0000-00-00 00:00:00.000000000 +0000
+@@ -216,10 +216,8 @@
+ _T_ECLIPSE("The %s executable launcher was unable to locate its \n\
+ companion launcher jar.");
+ 
+-#ifdef LINUX
+ static _TCHAR* gtk2Msg =
+ _T_ECLIPSE("The %s executable launcher no longer supports running with GTK + 2.x. Continuing using GTK+ 3.x.");
+-#endif
+ 
+ static _TCHAR* homeMsg =
+ _T_ECLIPSE("The %s executable launcher was unable to locate its \n\
+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 @@
 				;;
 		esac
@@ -231,8 +315,9 @@
 		esac
 	fi
 else
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	2021-03-08 20:18:47.380438000 +0100
+diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
@@ -81,10 +81,11 @@
  -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
  -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
@@ -272,23 +357,27 @@
 
 install: all
 	cp $(EXEC) $(OUTPUT_DIR)
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2021-03-08 21:04:15.182274000 +0100
-@@ -123,8 +123,9 @@
-                     <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
+diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -124,9 +124,10 @@
                       <fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/">
                         <include name="cocoa/macosx/x86_64/**/*"/>
+                         <include name="cocoa/macosx/aarch64/**/*"/>
 -                        <include name="gtk/linux/ppc64le/**/*"/>
+-                        <include name="gtk/linux/aarch64/**/*"/>
 -                        <include name="gtk/linux/x86_64/**/*"/>
 +                        <include name="gtk/freebsd/powerpc64/**/*"/>
 +                        <include name="gtk/freebsd/powerpc64le/**/*"/>
+                        <include name="gtk/freebsd/aarch64/**/*"/>
 +                        <include name="gtk/freebsd/amd64/**/*"/>
                         <include name="win32/win32/x86_64/**/*"/>
                       </fileset>
                     </copy>
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties	2021-03-08 21:04:39.288086000 +0100
-@@ -20,12 +20,15 @@
+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 @@
 root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe
 root.win32.win32.x86_64.permissions.755=launcher.exe
 
@@ -303,16 +392,20 @@
 root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
 root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName}
 
+ root.macosx.cocoa.aarch64=bin/cocoa/macosx/aarch64
+ root.macosx.cocoa.aarch64.permissions.755=Contents/MacOS/${launcherName}
+ 
 -root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
 -root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
 +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
 +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
 
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml	2021-03-08 21:05:37.421487000 +0100
-@@ -76,30 +76,38 @@
- 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" />
- 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/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
+@@ -84,30 +84,38 @@
+ 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.aarch64/${collectingFolder}" includes="${launcherName}" />
+ 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.aarch64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
 	</target>
 -	<target name="rootFileslinux_gtk_ppc64le">
 -		<mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/>
@@ -338,7 +431,7 @@
 			<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.powerpc64le/${collectingFolder}" includes="launcher" />
+		<chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" includes="launcher" />
 	</target>
 -	<target name="rootFileslinux_gtk_x86_64">
 -		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
@@ -364,21 +457,23 @@
 	<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">
-@@ -138,8 +146,9 @@
+@@ -146,9 +154,9 @@
 	<target name="rootFilesgroup_group_group">
 		<antcall target="rootFileswin32_win32_x86_64"/>
 		<antcall target="rootFilesmacosx_cocoa_x86_64"/>
 -		<antcall target="rootFileslinux_gtk_ppc64le"/>
+-		<antcall target="rootFileslinux_gtk_aarch64"/>
 -		<antcall target="rootFileslinux_gtk_x86_64"/>
 +		<antcall target="rootFilesfreebsd_gtk_powerpc64"/>
-+		<antcall target="rootFilesfreebsd_gtk_powerpc64le"/>
+		<antcall target="rootFilesfreebsd_gtk_aarch64"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
 	</target>
 
 	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform.launchers.">
--- rt.equinox.framework/pom.xml.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/pom.xml	2021-03-08 21:06:05.486823000 +0100
-@@ -54,27 +54,27 @@
+diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml
+--- rt.equinox.framework/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -53,27 +53,27 @@
       </repositories>
     </profile>
     <profile>
@@ -412,68 +507,26 @@
       </modules>
     </profile>
   </profiles>
-@@ -88,8 +88,9 @@
-     
-     <module>bundles/org.eclipse.equinox.launcher</module>
+@@ -89,9 +89,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>
+-    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
 -    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
 -    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
+    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64</module>
     <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>
 
     <module>bundles/org.eclipse.osgi.tests</module>
--- rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties.orig	2020-05-28 15:19:35.000000000 +0200
-+++ rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties	2021-03-08 20:18:47.382294000 +0100
+diff -ru rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties
+--- rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties	0000-00-00 00:00:00.000000000 +0000
@@ -8,4 +8,4 @@
 #j_linux.x86_64=/shared/common/jdk-1.6.0_10
 
 #user names to use on each of the machines if different from the user running hudson, u_${os}.${arch}
 -u_linux.x86_64=swtbuild
 +u_freebsd.amd64=swtbuild
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/.project.orig	2021-03-08 21:42:53.881166000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/.project	2021-03-08 21:44:11.973619000 +0100
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <projectDescription>
-	<name>org.eclipse.equinox.launcher.gtk.linux.ppc64le</name>
-+	<name>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le</name>
- 	<comment></comment>
- 	<projects>
- 	</projects>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF.orig	2021-03-08 21:42:40.022621000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF	2021-03-08 21:43:38.177892000 +0100
-@@ -2,9 +2,9 @@
- Bundle-ManifestVersion: 2
- Bundle-Name: %pluginName
- 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.1.1200.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
-Bundle-Localization: launcher.gtk.linux.ppc64le
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64le))
-+Bundle-Localization: launcher.gtk.freebsd.powerpc64le
- Eclipse-BundleShape: dir
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml.orig	2021-03-08 21:42:26.004849000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml	2021-03-08 21:43:17.841469000 +0100
-@@ -18,14 +18,14 @@
-     <relativePath>../../launcher-binary-parent</relativePath>
-   </parent>
-   <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.1.1200-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
- 
-   <properties>
-    <os>linux</os>
-+    <os>freebsd</os>
-     <ws>gtk</ws>
-    <arch>ppc64le</arch>
-+    <arch>powerpc64le</arch>
-     <skipAPIAnalysis>true</skipAPIAnalysis>
-   </properties>
- </project>
--- a/java/eclipse/files/patch-rt.equinox.p2
+++ b/java/eclipse/files/patch-rt.equinox.p2
--- a/java/eclipse/scripts/pre-build
+++ b/java/eclipse/scripts/pre-build
@@ -4,7 +4,7 @@
 #
 cd ${WRKSRC}

-ARCHS="amd64 powerpc64 powerpc64le"
+ARCHS="aarch64 amd64 powerpc64 powerpc64le"

 # Create dummy repo for jgit
 if [ ! -d .git ]
--- a/java/eclipse/scripts/pre-patch
+++ b/java/eclipse/scripts/pre-patch
@@ -4,11 +4,11 @@
 #
 LINUX_DIRS="
 	eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*
+	eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.linux.*
 	eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.*
 	eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux
-	eclipse.platform.team/bundles/org.eclipse.core.net.linux.*
-	eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux
-	rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.*
+	eclipse.platform.team/bundles/org.eclipse.core.net.linux*
+	rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux*
 	rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.*
 	rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.*"

@@ -42,6 +42,8 @@ do

 	NEWNAME=$(rename_arch ${D})
 	mv ${D} ${NEWNAME}
+	echo "INFO: ${D} -> ${NEWNAME}"
+
 	case ${NEWNAME} in
 	*.powerpc64)
 		cp -rf ${NEWNAME} `echo ${NEWNAME} | sed -e 's/powerpc64/powerpc64le/'`;;