FreeBSD Bugzilla – Attachment 218501 Details for
Bug 250084
java/eclipse: update to 4.17
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
4.17 update
4.17.patch (text/plain), 115.42 KB, created by
Jonathan Chen
on 2020-10-03 20:16:50 UTC
(
hide
)
Description:
4.17 update
Filename:
MIME Type:
Creator:
Jonathan Chen
Created:
2020-10-03 20:16:50 UTC
Size:
115.42 KB
patch
obsolete
>diff -ruN /usr/ports/java/eclipse/Makefile ./Makefile >--- /usr/ports/java/eclipse/Makefile 2020-10-04 09:12:19.835205000 +1300 >+++ ./Makefile 2020-10-04 08:42:05.545301000 +1300 >@@ -2,12 +2,12 @@ > # $FreeBSD$ > > PORTNAME= eclipse >-PORTVERSION= 4.16 >+PORTVERSION= 4.17 > 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_17 >+ECLIPSE_TSTAMP= 20200916-1119 > > ECLIPSE_SUFX= ${ECLIPSE_TAG}.tar.xz > ECLIPSE_MODULES=jdt/eclipse.jdt \ >@@ -42,17 +42,24 @@ > DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g} > .endfor > >+CEF_FILE= cef_binary_3.3071.1649.g98725e6_linux64_minimal >+MASTER_SITES+= http://opensource.spotify.com/cefbuilds/:spotify \ >+ https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:github >+DISTFILES+= ${CEF_FILE}.tar.bz2:spotify \ >+ cargo-repo.${ECLIPSE_TAG}.tbz:github >+ > 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 \ >+ rustc:lang/rust \ > zip:archivers/zip > LIB_DEPENDS= libsecret-1.so:security/libsecret \ > libwebkit2gtk-4.0.so:www/webkit2-gtk3 >@@ -74,9 +81,12 @@ > > 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} CARGO_HOME=${WRKDIR}/cargo-repo.${ECLIPSE_TAG} >+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 > >@@ -84,7 +94,7 @@ > 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} >diff -ruN /usr/ports/java/eclipse/distinfo ./distinfo >--- /usr/ports/java/eclipse/distinfo 2020-10-04 09:12:19.889112000 +1300 >+++ ./distinfo 2020-10-03 17:59:58.654749000 +1300 >@@ -1,53 +1,57 @@ >-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 = 1601701198 >+SHA256 (eclipse/eclipse.jdt-R4_17.tar.xz) = 269ecf061ba558a551caa35c9002d32c63d21427a77c428ae2f87f0487119f57 >+SIZE (eclipse/eclipse.jdt-R4_17.tar.xz) = 29324 >+SHA256 (eclipse/eclipse.jdt.core-R4_17.tar.xz) = 2f3e690973738c5c5e76b7a79d7a70a45abbd5e6037fc3d2bd615afa359827f3 >+SIZE (eclipse/eclipse.jdt.core-R4_17.tar.xz) = 8668252 >+SHA256 (eclipse/eclipse.jdt.core.binaries-R4_17.tar.xz) = f39e48d9fbcb78b068143e3d641f87d6b7f7358de9486483747d019dc8f75397 >+SIZE (eclipse/eclipse.jdt.core.binaries-R4_17.tar.xz) = 34417076 >+SHA256 (eclipse/eclipse.jdt.debug-R4_17.tar.xz) = 640e579a103a07fffc1a3b7df858e17b7694df5d79f5a46b4509d916862e900a >+SIZE (eclipse/eclipse.jdt.debug-R4_17.tar.xz) = 1456148 >+SHA256 (eclipse/eclipse.jdt.ui-R4_17.tar.xz) = 8c6c039c5718a037023c645394af2a8d72e132a7bad3043e5f1a045daa0bfe69 >+SIZE (eclipse/eclipse.jdt.ui-R4_17.tar.xz) = 15777160 >+SHA256 (eclipse/eclipse.pde.build-R4_17.tar.xz) = 2caa18ac68b8eb3db588c4c7662574f54a4490257799c642ccffe735efeee7a4 >+SIZE (eclipse/eclipse.pde.build-R4_17.tar.xz) = 868616 >+SHA256 (eclipse/eclipse.pde.ui-R4_17.tar.xz) = 88add88a4074b88ce1040435ec5c1605e86f5ec4ae6460635a7a5943c2f4eafc >+SIZE (eclipse/eclipse.pde.ui-R4_17.tar.xz) = 29792008 >+SHA256 (eclipse/eclipse.platform-R4_17.tar.xz) = e5c8001e66dadadbd350f3967a22ab5ba98d4b48ace6e1f2c8b165598a4d5037 >+SIZE (eclipse/eclipse.platform-R4_17.tar.xz) = 1114336 >+SHA256 (eclipse/eclipse.platform.common-R4_17.tar.xz) = 3ee6f648e28ff82f13a76f7dd28e246481d6ca21410af015fa5f50d389bc9b26 >+SIZE (eclipse/eclipse.platform.common-R4_17.tar.xz) = 34803672 >+SHA256 (eclipse/eclipse.platform.debug-R4_17.tar.xz) = 23a103fec47b3769e41d73f533af820efc2b08f47a0572145fce82306c4d2972 >+SIZE (eclipse/eclipse.platform.debug-R4_17.tar.xz) = 1376536 >+SHA256 (eclipse/eclipse.platform.releng-R4_17.tar.xz) = 3abfce8d206885ea491bdfa9ba7cd1b838db4a0f7a1193d5cfa16857d5728174 >+SIZE (eclipse/eclipse.platform.releng-R4_17.tar.xz) = 407628 >+SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_17.tar.xz) = daca0a3bf9405b8e637504e5cd51a417020cb697d217dfb3e877ae5de825d235 >+SIZE (eclipse/eclipse.platform.releng.aggregator-R4_17.tar.xz) = 612624 >+SHA256 (eclipse/eclipse.platform.resources-R4_17.tar.xz) = 3b01814c2cda6e194d03896c217230c3550be24a42c07d2b29f124faf6d0223f >+SIZE (eclipse/eclipse.platform.resources-R4_17.tar.xz) = 817048 >+SHA256 (eclipse/eclipse.platform.runtime-R4_17.tar.xz) = aae47cbb2402849539af571bf2686cb298b6f31f3af9ee661ca85c2716e602a1 >+SIZE (eclipse/eclipse.platform.runtime-R4_17.tar.xz) = 430740 >+SHA256 (eclipse/eclipse.platform.swt-R4_17.tar.xz) = 2b85d32c340b372e7943cf4aba8ed78a80cb60d78ec268722fa2286f373c38c2 >+SIZE (eclipse/eclipse.platform.swt-R4_17.tar.xz) = 6325720 >+SHA256 (eclipse/eclipse.platform.swt.binaries-R4_17.tar.xz) = 8868cb16495651d08cbc1f26a10f30237ff587a86a3f0d688df150761fa55de9 >+SIZE (eclipse/eclipse.platform.swt.binaries-R4_17.tar.xz) = 1964796 >+SHA256 (eclipse/eclipse.platform.team-R4_17.tar.xz) = d6e2c76b8f1ad66533f7acf496f3064a6fdfffd7c207bad83aca2993e17a0c0c >+SIZE (eclipse/eclipse.platform.team-R4_17.tar.xz) = 4633648 >+SHA256 (eclipse/eclipse.platform.text-R4_17.tar.xz) = 87c78822a85577c3c2d90c17dc350ac4fddf536e50a8730dc1b2bce7e0da67bd >+SIZE (eclipse/eclipse.platform.text-R4_17.tar.xz) = 1324456 >+SHA256 (eclipse/eclipse.platform.ua-R4_17.tar.xz) = 4953180e172edec3f8739e1fe05bd789a496343e77de4b2ee4b418ff7ce74262 >+SIZE (eclipse/eclipse.platform.ua-R4_17.tar.xz) = 4621396 >+SHA256 (eclipse/eclipse.platform.ui-R4_17.tar.xz) = 442b9cff8a8e4f27420de10abe83b869217654e0d8b6851daf3075c465e37ed8 >+SIZE (eclipse/eclipse.platform.ui-R4_17.tar.xz) = 5919656 >+SHA256 (eclipse/eclipse.platform.ui.tools-R4_17.tar.xz) = 86ed79e80c313e546d2e3b03f863136650ff59cea923efc37c4bc832d91d25d1 >+SIZE (eclipse/eclipse.platform.ui.tools-R4_17.tar.xz) = 328796 >+SHA256 (eclipse/rt.equinox.binaries-R4_17.tar.xz) = df76b04970fa1c40250d5a5d3a09d796fc20af2ac3d3a18b59d12d175b10cc62 >+SIZE (eclipse/rt.equinox.binaries-R4_17.tar.xz) = 354980 >+SHA256 (eclipse/rt.equinox.bundles-R4_17.tar.xz) = 85dfca96f8152e6345eb206468fea5d34aafb0cb7b2e17d03eba660db62f61b1 >+SIZE (eclipse/rt.equinox.bundles-R4_17.tar.xz) = 1166712 >+SHA256 (eclipse/rt.equinox.framework-R4_17.tar.xz) = ddbc3943303a0095fcb31a12fab223968f2708727919ab6a05755d46788a57fc >+SIZE (eclipse/rt.equinox.framework-R4_17.tar.xz) = 2842948 >+SHA256 (eclipse/rt.equinox.p2-R4_17.tar.xz) = 518c13449bde33a2dab6c777d9545ded294987f761cc9e9bdbfcbbb6eadd3c72 >+SIZE (eclipse/rt.equinox.p2-R4_17.tar.xz) = 48487780 >+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/cargo-repo.R4_17.tbz) = d5f0bc14119c0af7f41b734232125828380ed9fe180e282421aaa86d979d0f1f >+SIZE (eclipse/cargo-repo.R4_17.tbz) = 57938943 >+SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.17_GH0.tar.gz) = 2063a05d4c8661a29c09318edb8d812fca2b8945e7c021982298be9fa8b71932 >+SIZE (eclipse/daemonblade-eclipse-maven-repo-4.17_GH0.tar.gz) = 200913876 >diff -ruN /usr/ports/java/eclipse/files/cef-patch ./files/cef-patch >--- /usr/ports/java/eclipse/files/cef-patch 1970-01-01 12:00:00.000000000 +1200 >+++ ./files/cef-patch 2020-10-02 17:55:23.250555000 +1300 >@@ -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 >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse-platform-parent ./files/patch-eclipse-platform-parent >--- /usr/ports/java/eclipse/files/patch-eclipse-platform-parent 2020-10-04 09:12:19.891428000 +1300 >+++ ./files/patch-eclipse-platform-parent 2020-10-04 08:45:51.110067000 +1300 >@@ -5,15 +5,15 @@ > '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.17-I-builds/</eclipserun-repo> >++ <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.17/</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.17-I-builds</comparator.repo> >++ <comparator.repo>https://download.eclipse.org/eclipse/updates/4.17</comparator.repo> > > <!-- > NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file. >-@@ -254,14 +254,14 @@ >+@@ -254,17 +254,17 @@ > </target> > <environments> > <environment> >@@ -30,14 +30,18 @@ > - <arch>ppc64le</arch> > + <arch>powerpc64</arch> > </environment> >- <environment> >- <os>win32</os> >+ <environment> >+- <os>linux</os> >++ <os>freebsd</os> >+ <ws>gtk</ws> >+ <arch>aarch64</arch> >+ </environment> > @@ -626,7 +626,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.17-I-builds</eclipse-p2-repo.url> >++ <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.17</eclipse-p2-repo.url> > </properties> > <repositories> > <repository> >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.pde.ui ./files/patch-eclipse.pde.ui >--- /usr/ports/java/eclipse/files/patch-eclipse.pde.ui 2020-10-04 09:12:19.892231000 +1300 >+++ ./files/patch-eclipse.pde.ui 2020-10-04 08:45:53.931255000 +1300 >@@ -1,7 +1,7 @@ > 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 >-@@ -80,8 +80,8 @@ >+@@ -82,8 +82,8 @@ > <plugin id="org.eclipse.osgi.util"/> > <plugin id="org.eclipse.swt"/> > <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/> >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.releng ./files/patch-eclipse.platform.releng >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.releng 2020-10-04 09:12:19.893805000 +1300 >+++ ./files/patch-eclipse.platform.releng 2020-10-04 08:45:54.054259000 +1300 >@@ -40,7 +40,18 @@ > download-size="0" > install-size="0" > version="0.0.0" >-@@ -465,9 +465,9 @@ >+@@ -411,8 +411,8 @@ >+ unpack="false"/> >+ >+ <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" >+@@ -475,9 +475,9 @@ > unpack="false"/> > > <plugin >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder ./files/patch-eclipse.platform.releng.tychoeclipsebuilder >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder 2020-10-04 09:12:19.894549000 +1300 >+++ ./files/patch-eclipse.platform.releng.tychoeclipsebuilder 2020-10-04 08:45:54.164945000 +1300 >@@ -1,7 +1,7 @@ > diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml > --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 > +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 >-@@ -8,12 +8,12 @@ >+@@ -8,16 +8,16 @@ > fileName="eclipse-SDK-${BUILD_ID}-win32-x86_64.zip"></platform> > <platform > id="SLG264" >@@ -16,9 +16,15 @@ > + name="FreeBSD (64 bit version for Power PC)" > + fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.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 +70,12 @@ >+@@ -74,16 +74,16 @@ > fileName="eclipse-platform-${BUILD_ID}-win32-x86_64.zip"></platform> > <platform > id="PLG264" >@@ -33,9 +39,15 @@ > + 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 +150,12 @@ >+@@ -158,16 +158,16 @@ > fileName="swt-${BUILD_ID}-win32-win32-x86_64.zip"></platform> > <platform > id="SWTLG64" >@@ -50,6 +62,12 @@ > + 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)" > diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml >@@ -70,14 +88,16 @@ > 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,8 +14,8 @@ >+@@ -14,9 +14,9 @@ > <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="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" /> > </target> > >@@ -91,8 +111,8 @@ > - <linux icon="icon.xpm"/> > + <freebsd icon="icon.xpm"/> > <macosx icon="rt.icns"/> >- <win useIco="false"> >- <bmp/> >+ <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 >@@ -108,7 +128,7 @@ > </environment> > <environment> > <os>win32</os> >-@@ -91,7 +91,7 @@ >+@@ -92,7 +92,7 @@ > <configuration> > <formats> > <win32>zip</win32> >@@ -181,7 +201,7 @@ > 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 >-@@ -29,11 +29,11 @@ >+@@ -29,14 +29,14 @@ > #root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe > #root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe > >@@ -190,9 +210,14 @@ > +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.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.aarch64=rootfiles/freebsd.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/aarch64 >++root.freebsd.gtk.aarch64.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.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 >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.resources ./files/patch-eclipse.platform.resources >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.resources 2020-10-04 09:12:19.895757000 +1300 >+++ ./files/patch-eclipse.platform.resources 2020-10-04 08:45:54.441669000 +1300 >@@ -29,6 +29,42 @@ > -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/ >+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/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 >@@ -145,12 +181,14 @@ > 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,8 +52,8 @@ >+@@ -52,9 +52,9 @@ > > <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.amd64</module> > <module>bundles/org.eclipse.core.filesystem.macosx</module> >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.runtime ./files/patch-eclipse.platform.runtime >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.runtime 2020-10-04 09:12:19.896827000 +1300 >+++ ./files/patch-eclipse.platform.runtime 2020-10-04 08:45:54.707509000 +1300 >@@ -13,7 +13,7 @@ > 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$ > >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.swt ./files/patch-eclipse.platform.swt >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.swt 2020-10-04 09:12:19.896949000 +1300 >+++ ./files/patch-eclipse.platform.swt 2020-10-04 08:45:55.792151000 +1300 >@@ -10,6 +10,17 @@ > </attributes> > </classpathentry> > <classpathentry kind="src" path="Eclipse SWT PI/cairo"/> >+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 >@@ -25,10 +36,10 @@ > 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 >-@@ -69,12 +69,12 @@ >+@@ -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; > } >@@ -51,7 +62,7 @@ > > export CFLAGS='-O -Wall -fPIC' > >-@@ -86,21 +86,14 @@ >+@@ -86,27 +86,25 @@ > MAKEFILE=make_win32.mak > ;; > *) >@@ -74,9 +85,8 @@ > fi > case $MODEL in > "x86_64") >-@@ -111,6 +104,11 @@ >- SWT_ARCH=x86 >- AWT_ARCH=i386 >+ SWT_ARCH=x86_64 >+ AWT_ARCH=amd64 > ;; > + "powerpc" | "powerpc64") > + SWT_ARCH=ppc64 >@@ -86,7 +96,7 @@ > *) > SWT_ARCH=$MODEL > AWT_ARCH=$MODEL >-@@ -118,6 +116,13 @@ >+@@ -114,6 +112,13 @@ > esac > > case $SWT_OS.$SWT_ARCH in >@@ -97,35 +107,56 @@ > + export JAVA_HOME > + fi > + ;; >- "linux.x86") >+ "linux.x86_64") > if [ "${CC}" = "" ]; then > export CC=gcc >-@@ -194,7 +199,7 @@ >+@@ -148,7 +153,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' ]; then >+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then >++if [ ${MODEL} = 'amd64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'aarch64' ]; then > SWT_PTR_CFLAGS=-DJNI64 > if [ -d /lib64 ]; then > XLIB64=-L/usr/X11R6/lib64 >-@@ -205,6 +210,11 @@ >- XLIB64="${XLIB64} -L/usr/lib64" >+@@ -160,6 +165,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 >+ >+@@ -275,10 +285,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 +342,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 >-@@ -103,16 +103,18 @@ >- WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o >+@@ -108,16 +108,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` >@@ -146,7 +177,7 @@ > > ifndef NO_STRIP > # -s = Remove all symbol table and relocation information from the executable. >-@@ -255,10 +257,6 @@ >+@@ -280,10 +282,6 @@ > cp $(ALL_SWT_LIBS) $(OUTPUT_DIR) > ifeq ($(BUILD_WEBKIT2EXTENSION),yes) > @# Copy webextension into it's own folder, but create folder first. >@@ -186,7 +217,7 @@ > 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,11 +16,11 @@ >+@@ -16,14 +16,14 @@ > 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 >@@ -202,13 +233,21 @@ > 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.name = org.eclipse.swt.gtk.linux.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 >-@@ -63,11 +63,11 @@ >+@@ -64,15 +64,15 @@ > </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"/> > - <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/> > + <param name="fragment" value="org.eclipse.swt.gtk.freebsd.powerpc64"/> > </antcall> >@@ -219,55 +258,319 @@ > </antcall> > <antcall target="check_fragment_libraries"> > <param name="library_count" value="4"/> >-@@ -80,12 +80,12 @@ >+@@ -85,13 +85,13 @@ > <property name="checkdir" value="~/build/check_libraries"/> >- <property name="library_count" value="23"/> >+ <property name="library_count" value="43"/> > <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.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.*/**, **/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/**, **/org.eclipse.swt.browser.chromium.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.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**, **/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/**, **/org.eclipse.swt.browser.chromium.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.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.*/**, **/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/chromium-*/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/chromium-*/**, **/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/chromium-*/**"> >++ <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.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**, **/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/chromium-*/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/chromium-*/**, **/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/chromium-*/**"> >+ <filename regex="[0-9][0-9][0-9][0-9]"/> >+ <filename regex="${swt_version}" negate="true"/> > <exclude name="**/.git/**"/> >-@@ -115,13 +115,13 @@ >- 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_mac}" >- username="swtbuild" >-@@ -139,10 +139,10 @@ >- <matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/> >- </and> >+@@ -355,7 +355,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.115.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 >+@@ -35,12 +35,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_mac_test" value="${success_msg}" else="${fail_msg}"> >+- <property name="ceffile" value="cef_binary_3.3071.1649.g98725e6_${cefos}64_minimal.tar.bz2"/> >+- <mkdir dir="${tmphome}"/> >+- <get src="http://opensource.spotify.com/cefbuilds/${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 >-@@ -103,7 +103,7 @@ >+@@ -108,7 +108,7 @@ > xsi:type="predicates:NotPredicate"> > <operand > xsi:type="predicates:NamePredicate" >@@ -279,7 +582,7 @@ > 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,11 +10,11 @@ >+@@ -10,14 +10,14 @@ > requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) > > requires.3.namespace = org.eclipse.equinox.p2.iu >@@ -295,6 +598,9 @@ > 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.name = org.eclipse.swt.gtk.linux.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 >@@ -312,7 +618,7 @@ > </modules> > </profile> > <profile> >-@@ -118,7 +119,9 @@ >+@@ -119,7 +120,9 @@ > <module>examples/org.eclipse.swt.examples.ole.win32</module> > <module>examples/org.eclipse.swt.examples.views</module> > <module>tests/org.eclipse.swt.tests.fragments.feature</module> >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.swt.binaries ./files/patch-eclipse.platform.swt.binaries >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.swt.binaries 2020-10-04 09:12:19.897553000 +1300 >+++ ./files/patch-eclipse.platform.swt.binaries 2020-10-04 08:45:55.898603000 +1300 >@@ -1,3 +1,100 @@ >+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.115.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.115.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.115.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 >@@ -7,7 +104,7 @@ > 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.115.0.qualifier > Bundle-ManifestVersion: 2 > Bundle-Localization: fragment > @@ -26,8 +26,8 @@ >@@ -45,7 +142,7 @@ > <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.115.0-SNAPSHOT</version> > <packaging>eclipse-plugin</packaging> > > <properties> >@@ -83,7 +180,7 @@ > 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.115.0.qualifier > Bundle-ManifestVersion: 2 > Bundle-Localization: fragment > @@ -26,8 +26,8 @@ >@@ -141,7 +238,7 @@ > <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.115.0-SNAPSHOT</version> > <packaging>eclipse-plugin</packaging> > > <properties> >@@ -171,7 +268,7 @@ > 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.115.0.qualifier > Bundle-ManifestVersion: 2 > Bundle-Localization: fragment > @@ -26,8 +26,8 @@ >@@ -212,7 +309,7 @@ > <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.115.0-SNAPSHOT</version> > <packaging>eclipse-plugin</packaging> > > <properties> >@@ -236,14 +333,20 @@ > 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 >-@@ -54,8 +54,8 @@ >+@@ -54,12 +54,12 @@ > > <modules> > <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</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.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> > >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.text ./files/patch-eclipse.platform.text >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.text 2020-10-04 09:12:19.898233000 +1300 >+++ ./files/patch-eclipse.platform.text 2020-10-04 08:45:57.305943000 +1300 >@@ -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 @@ >+@@ -1314,7 +1314,7 @@ > %blockSelectionModeFont.description > </description> > <fontValue >diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.ui ./files/patch-eclipse.platform.ui >--- /usr/ports/java/eclipse/files/patch-eclipse.platform.ui 2020-10-04 09:12:19.898427000 +1300 >+++ ./files/patch-eclipse.platform.ui 2020-10-04 08:46:00.160299000 +1300 >@@ -61,7 +61,7 @@ > 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 >-@@ -210,7 +210,8 @@ >+@@ -209,7 +209,8 @@ > if (currentTitleControl.getVisible()) { > int tw = width - HMARGIN * 2 - SPACING * 2; > String os = System.getProperty("os.name"); //$NON-NLS-1$ >@@ -71,7 +71,7 @@ > tw += 1; // See Bug 342610 > } > if (bsize != null) >-@@ -584,4 +585,4 @@ >+@@ -577,4 +578,4 @@ > target.setTransfer(transferTypes); > target.addDropListener(listener); > } >@@ -114,7 +114,7 @@ > 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 >-@@ -403,20 +403,20 @@ >+@@ -403,18 +403,18 @@ > fragment="true"/> > > <plugin >@@ -129,7 +129,18 @@ > install-size="0" > version="0.0.0" > fragment="true"/> >+ >+ <plugin >+- id="org.eclipse.equinox.launcher.gtk.linux.aarch64" >+- os="linux" >++ id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64" >++ os="freebsd" >+ ws="gtk" >+ arch="aarch64" >+ download-size="0" >+@@ -424,10 +424,10 @@ > >+ > <plugin > - id="org.eclipse.equinox.launcher.gtk.linux.x86_64" > - os="linux" >@@ -141,7 +152,7 @@ > download-size="0" > install-size="0" > version="0.0.0" >-@@ -451,10 +451,10 @@ >+@@ -462,10 +462,10 @@ > unpack="false"/> > > <plugin >@@ -155,8 +166,19 @@ > download-size="0" > install-size="0" > version="0.0.0" >-@@ -462,10 +462,10 @@ >+@@ -473,8 +473,8 @@ > unpack="false"/> >+ >+ <plugin >+- id="org.eclipse.swt.gtk.linux.aarch64" >+- os="linux" >++ id="org.eclipse.swt.gtk.freebsd.aarch64" >++ os="freebsd" >+ ws="gtk" >+ arch="aarch64" >+ download-size="0" >+@@ -484,10 +484,10 @@ >+ unpack="false"/> > > <plugin > - id="org.eclipse.swt.gtk.linux.x86_64" >@@ -169,16 +191,32 @@ > download-size="0" > install-size="0" > version="0.0.0" >+@@ -517,10 +517,10 @@ >+ unpack="false"/> >+ >+ <plugin >+- id="org.eclipse.swt.browser.chromium.gtk.linux.x86_64" >+- os="linux" >++ id="org.eclipse.swt.browser.chromium.gtk.freebsd.amd64" >++ os="freebsd" >+ ws="gtk" >+- arch="x86_64" >++ arch="amd64" >+ download-size="0" >+ install-size="0" >+ version="0.0.0" > 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,8 +39,8 @@ >+@@ -39,9 +39,9 @@ > <plugin id="javax.xml"/> > <plugin id="org.eclipse.swt"/> > <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/> > - <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.aarch64"/> > + <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"/> > <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/> > </excludes> >diff -ruN /usr/ports/java/eclipse/files/patch-rt.equinox.framework ./files/patch-rt.equinox.framework >--- /usr/ports/java/eclipse/files/patch-rt.equinox.framework 2020-10-04 09:12:19.898662000 +1300 >+++ ./files/patch-rt.equinox.framework 2020-10-04 08:46:00.959552000 +1300 >@@ -7,7 +7,7 @@ > 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 >+ Bundle-Version: 1.1.1300.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=aarch64)) > -Bundle-Localization: launcher.gtk.linux.aarch64 >@@ -23,7 +23,7 @@ > <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.1.1300-SNAPSHOT</version> > <packaging>eclipse-plugin</packaging> > > <properties> >@@ -52,7 +52,7 @@ > 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 >+ Bundle-Version: 1.1.1300.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=x86_64)) > -Bundle-Localization: launcher.gtk.linux.x86_64 >@@ -78,7 +78,7 @@ > <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.1.1300-SNAPSHOT</version> > <packaging>eclipse-plugin</packaging> > > <properties> >@@ -110,7 +110,7 @@ > 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 >+ Bundle-Version: 1.1.1300.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 >@@ -126,7 +126,7 @@ > <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.1.1300-SNAPSHOT</version> > <packaging>eclipse-plugin</packaging> > > <properties> >@@ -141,7 +141,7 @@ > 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,11 +24,11 @@ >+@@ -24,14 +24,14 @@ > root.win32.win32.x86_64=bin/win32/win32/x86_64 > root.win32.win32.x86_64.permissions.755=launcher.exe > >@@ -150,6 +150,11 @@ > +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.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 > >@@ -160,7 +165,7 @@ > 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 >-@@ -33,20 +33,20 @@ >+@@ -33,18 +33,18 @@ > fragment="true"/> > > <plugin >@@ -175,6 +180,17 @@ > install-size="0" > version="0.0.0" > fragment="true"/> >+ >+ <plugin >+- id="org.eclipse.equinox.launcher.gtk.linux.aarch64" >+- os="linux" >++ id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64" >++ os="freebsd" >+ ws="gtk" >+ arch="aarch64" >+ download-size="0" >+@@ -53,10 +53,10 @@ >+ fragment="true"/> > > <plugin > - id="org.eclipse.equinox.launcher.gtk.linux.x86_64" >@@ -275,13 +291,15 @@ > 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 >-@@ -123,8 +123,8 @@ >+@@ -123,9 +123,9 @@ > <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true"> > <fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/"> > <include name="cocoa/macosx/x86_64/**/*"/> > - <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/aarch64/**/*"/> > + <include name="gtk/freebsd/amd64/**/*"/> > <include name="win32/win32/x86_64/**/*"/> > </fileset> >@@ -354,13 +372,15 @@ > </target> > <target name="rootFileslinux_gtk_ia64"> > <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> >-@@ -138,8 +138,8 @@ >+@@ -138,9 +138,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_aarch64"/> > + <antcall target="rootFilesfreebsd_gtk_amd64"/> > </target> > >@@ -402,12 +422,14 @@ > </modules> > </profile> > </profiles> >-@@ -88,8 +88,8 @@ >+@@ -88,9 +88,9 @@ > > <module>bundles/org.eclipse.equinox.launcher</module> > <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</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.amd64</module> > <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module> >diff -ruN /usr/ports/java/eclipse/files/patch-rt.equinox.p2 ./files/patch-rt.equinox.p2 >--- /usr/ports/java/eclipse/files/patch-rt.equinox.p2 2020-10-04 09:12:19.899326000 +1300 >+++ ./files/patch-rt.equinox.p2 2020-10-04 08:46:01.896464000 +1300 >@@ -10,20 +10,6 @@ > <booleanAttribute key="tracing" value="false"/> > <booleanAttribute key="useDefaultConfigArea" value="true"/> > <stringAttribute key="workspace_bundles" value="org.eclipse.equinox.p2.touchpoint.osgi@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.exemplarysetup@default:true,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.console@default:true,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.sat4j.core@default:default,org.eclipse.equinox.simpleconfigurator@1:true"/> >-diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml >---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 >-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 >-@@ -22,9 +22,7 @@ >- <properties> >- <testSuite>${project.artifactId}</testSuite> >- <testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass> >-- <!-- despite best inentions I was not able to add automatiz detection here --> >-- <!-- Linux is default because Hudson runs those tests on Linux --> >-- <dropinsProduct>org.eclipse.equinox.p2.reconciler-linux.gtk.x86_64.tar.gz</dropinsProduct> >-+ <dropinsProduct>org.eclipse.equinox.p2.reconciler-freebsd.gtk.amd64.tar.gz</dropinsProduct> >- </properties> >- >- <build> > diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml > --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 > +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 >@@ -48,7 +34,7 @@ > <plugin id="org.eclipse.core.runtime"/> > <plugin id="org.eclipse.e4.core.commands"/> > <plugin id="org.eclipse.e4.core.contexts"/> >-@@ -120,7 +120,7 @@ >+@@ -117,7 +117,7 @@ > <plugin id="org.eclipse.equinox.preferences"/> > <plugin id="org.eclipse.equinox.registry"/> > <plugin id="org.eclipse.equinox.security"/> >@@ -57,7 +43,7 @@ > <plugin id="org.eclipse.equinox.security.ui"/> > <plugin id="org.eclipse.equinox.simpleconfigurator"/> > <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/> >-@@ -133,7 +133,7 @@ >+@@ -130,7 +130,7 @@ > <plugin id="org.eclipse.osgi.util"/> > <plugin id="org.eclipse.swt"/> > <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/> >@@ -66,18 +52,6 @@ > <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/> > <plugin id="org.eclipse.ui"/> > <plugin id="org.eclipse.ui.workbench"/> >-diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch >---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch 0000-00-00 00:00:00.000000000 +0000 >-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch 0000-00-00 00:00:00.000000000 +0000 >-@@ -61,7 +61,7 @@ >- <stringAttribute key="pde.version" value="3.3"/> >- <stringAttribute key="product" value="org.eclipse.sdk.ide"/> >- <booleanAttribute key="run_in_ui_thread" value="true"/> >--<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:default,com.google.gson*2.8.2.v20180104-1110@default:default,com.google.guava@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.jcraft.jzlib@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.constants@default:default,org.apache.batik.css@default:default,org.apache.batik.i18n@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analyzers-common*7.1.0.v20180122-2126@default:default,org.apache.lucene.analyzers-smartcn@default:default,org.apache.lucene.core*7.1.0.v20171214-1510@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlgraphics@default:default,org.apiguardian@default:default,org.easymock@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.optional.junit@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.x86_64@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.tests.harness@default:default,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.ui.smartimport@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.linux.x86_64@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*2.2.100.v20180626-0953@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.lfs@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.releng.tools@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.test.performance.win32@default:default,org.eclipse.test.performance@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.genericeditor@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@default:default,org.eclipse.urischeme@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit.platform.commons@default:default,org.junit.platform.engine@default:default,org.junit.platform.launcher@default:default,org.junit@default:default,org.objectweb.asm*6.0.0.v20180116-1719@default:default,org.objectweb.asm*6.2.0.v20180807-1520@default:default,org.objectweb.asm.tree*6.2.0.v20180807-1520@default:default,org.opentest4j@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> >-+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:default,com.google.gson*2.8.2.v20180104-1110@default:default,com.google.guava@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.jcraft.jzlib@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.constants@default:default,org.apache.batik.css@default:default,org.apache.batik.i18n@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analyzers-common*7.1.0.v20180122-2126@default:default,org.apache.lucene.analyzers-smartcn@default:default,org.apache.lucene.core*7.1.0.v20171214-1510@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlgraphics@default:default,org.apiguardian@default:default,org.easymock@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.optional.junit@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.freebsd.amd64@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.freebsd.amd64@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.tests.harness@default:default,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.ui.smartimport@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.gtk.freebsd.amd64@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.freebsd.amd64@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*2.2.100.v20180626-0953@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.lfs@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.releng.tools@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.gtk.freebsd.amd64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.test.performance.win32@default:default,org.eclipse.test.performance@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.genericeditor@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@default:default,org.eclipse.urischeme@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit.platform.commons@default:default,org.junit.platform.engine@default:default,org.junit.platform.launcher@default:default,org.junit@default:default,org.objectweb.asm*6.0.0.v20180116-1719@default:default,org.objectweb.asm*6.2.0.v20180807-1520@default:default,org.objectweb.asm.tree*6.2.0.v20180807-1520@default:default,org.opentest4j@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> >- <stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin.test@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.installer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.tests.discovery@default:default,org.eclipse.equinox.p2.tests.optimizers@default:default,org.eclipse.equinox.p2.tests.ui@default:default,org.eclipse.equinox.p2.tests.verifier@default:default,org.eclipse.equinox.p2.tests@default:default,org.eclipse.equinox.p2.testserver@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.admin.rcp@default:default,org.eclipse.equinox.p2.ui.admin@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true"/> >- <booleanAttribute key="show_selected_only" value="false"/> >- <booleanAttribute key="tracing" value="false"/> > diff -ru rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml > --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 > +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 >diff -ruN /usr/ports/java/eclipse/scripts/pre-build ./scripts/pre-build >--- /usr/ports/java/eclipse/scripts/pre-build 2020-10-04 09:12:19.900197000 +1300 >+++ ./scripts/pre-build 2020-10-03 12:53:36.922879000 +1300 >@@ -4,7 +4,7 @@ > # > cd ${WRKSRC} > >-ARCHS="amd64 powerpc64" >+ARCHS="aarch64 amd64 powerpc64" > > # Create dummy repo for jgit > if [ ! -d .git ] >diff -ruN /usr/ports/java/eclipse/scripts/pre-patch ./scripts/pre-patch >--- /usr/ports/java/eclipse/scripts/pre-patch 2020-10-04 09:12:19.900287000 +1300 >+++ ./scripts/pre-patch 2020-10-04 08:17:42.572860000 +1300 >@@ -4,6 +4,7 @@ > # > 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.*
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
jonc
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 250084
:
218501
|
218580