From e1b29db6eb266748e352efcc6f9c4e96c118a316 Mon Sep 17 00:00:00 2001 From: Jonathan Chen Date: Fri, 24 Jun 2022 16:30:21 +0800 Subject: java/eclipse: Update to 4.24 PR: 264864 --- java/eclipse/Makefile | 80 ++-- java/eclipse/distinfo | 106 +++-- java/eclipse/files/cef-patch | 24 -- java/eclipse/files/eclipse.in | 2 + java/eclipse/files/patch-eclipse-platform-parent | 18 +- java/eclipse/files/patch-eclipse.pde | 146 +++++++ java/eclipse/files/patch-eclipse.pde.build | 53 --- java/eclipse/files/patch-eclipse.pde.ui | 15 - java/eclipse/files/patch-eclipse.platform.releng | 35 +- ...tch-eclipse.platform.releng.tychoeclipsebuilder | 12 +- .../eclipse/files/patch-eclipse.platform.resources | 28 +- java/eclipse/files/patch-eclipse.platform.swt | 448 +++------------------ .../files/patch-eclipse.platform.swt.binaries | 137 +------ java/eclipse/files/patch-eclipse.platform.team | 88 +--- java/eclipse/files/patch-eclipse.platform.text | 2 +- java/eclipse/files/patch-rt.equinox.bundles | 70 +--- java/eclipse/files/patch-rt.equinox.framework | 65 ++- java/eclipse/files/patch-rt.equinox.p2 | 18 +- java/eclipse/scripts/post-extract | 38 -- java/eclipse/scripts/pre-patch | 1 - 20 files changed, 403 insertions(+), 983 deletions(-) delete mode 100644 java/eclipse/files/cef-patch create mode 100644 java/eclipse/files/patch-eclipse.pde delete mode 100644 java/eclipse/files/patch-eclipse.pde.build delete mode 100644 java/eclipse/files/patch-eclipse.pde.ui delete mode 100644 java/eclipse/scripts/post-extract (limited to 'java') diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 2cdfd8398c6b..4676db5dcf44 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -1,56 +1,17 @@ # Created by: Jonathan Chen -# $FreeBSD$ PORTNAME= eclipse -PORTVERSION= 4.21 +PORTVERSION= 4.24 CATEGORIES= java devel -# Update to eclipse.platform.releng.aggregator.git git-tag on git.eclipse.org -ECLIPSE_TAG= R4_21 -ECLIPSE_TSTAMP= 20210915-1206 - -ECLIPSE_SUFX= ${ECLIPSE_TAG}.tar.xz -ECLIPSE_MODULES=jdt/eclipse.jdt \ - jdt/eclipse.jdt.core \ - jdt/eclipse.jdt.core.binaries \ - jdt/eclipse.jdt.debug \ - jdt/eclipse.jdt.ui \ - pde/eclipse.pde.build \ - pde/eclipse.pde.ui \ - platform/eclipse.platform \ - platform/eclipse.platform.common \ - platform/eclipse.platform.debug \ - platform/eclipse.platform.releng \ - platform/eclipse.platform.releng.aggregator \ - platform/eclipse.platform.resources \ - platform/eclipse.platform.runtime \ - platform/eclipse.platform.swt \ - platform/eclipse.platform.swt.binaries \ - platform/eclipse.platform.team \ - platform/eclipse.platform.text \ - platform/eclipse.platform.ua \ - platform/eclipse.platform.ui \ - platform/eclipse.platform.ui.tools \ - equinox/rt.equinox.binaries \ - equinox/rt.equinox.bundles \ - equinox/rt.equinox.framework \ - equinox/rt.equinox.p2 -# Each Eclipse module has its own MASTER_SITE -.for M in ${ECLIPSE_MODULES} -MASTER_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} \ - https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} -DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g} -.endfor - -CEF_FILE= cef_binary_3.3071.1649.g98725e6_linux64_minimal -MASTER_SITES+= https://cef-builds.spotifycdn.com/:spotify \ - https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:github -DISTFILES+= ${CEF_FILE}.tar.bz2:spotify +# Tag's Timestamp on eclipse-platform/eclipse.platform.releng.aggregator github.com +ECLIPSE_TAG= R4_24 +ECLIPSE_TSTAMP= 20220616-0004 DIST_SUBDIR= ${PORTNAME} MAINTAINER= jonc@chen.org.nz -COMMENT= Eclipse IDE 2020-09 +COMMENT= Eclipse IDE 2022-06 LICENSE= EPL @@ -65,8 +26,31 @@ USES= compiler:c++11-lang gmake pkgconfig gnome USE_GNOME= gtk30 USE_GITHUB= yes -GH_ACCOUNT= daemonblade -GH_PROJECT= eclipse-maven-repo +GH_TUPLE= eclipse-platform:eclipse.platform.releng.aggregator:${ECLIPSE_TAG} \ + eclipse-jdt:eclipse.jdt:${ECLIPSE_TAG}:a/eclipse.jdt \ + eclipse-jdt:eclipse.jdt.core:${ECLIPSE_TAG}:b/eclipse.jdt.core \ + eclipse-jdt:eclipse.jdt.core.binaries:${ECLIPSE_TAG}:c/eclipse.jdt.core.binaries \ + eclipse-jdt:eclipse.jdt.debug:${ECLIPSE_TAG}:d/eclipse.jdt.debug \ + eclipse-jdt:eclipse.jdt.ui:${ECLIPSE_TAG}:e/eclipse.jdt.ui \ + eclipse-pde:eclipse.pde:${ECLIPSE_TAG}:f/eclipse.pde \ + eclipse-platform:eclipse.platform:${ECLIPSE_TAG}:g/eclipse.platform \ + eclipse-platform:eclipse.platform.common:${ECLIPSE_TAG}:h/eclipse.platform.common \ + eclipse-platform:eclipse.platform.debug:${ECLIPSE_TAG}:i/eclipse.platform.debug \ + eclipse-platform:eclipse.platform.releng:${ECLIPSE_TAG}:j/eclipse.platform.releng \ + eclipse-platform:eclipse.platform.resources:${ECLIPSE_TAG}:k/eclipse.platform.resources \ + eclipse-platform:eclipse.platform.runtime:fd42b6e331:l/eclipse.platform.runtime \ + eclipse-platform:eclipse.platform.swt:${ECLIPSE_TAG}:m/eclipse.platform.swt \ + eclipse-platform:eclipse.platform.swt.binaries:${ECLIPSE_TAG}:n/eclipse.platform.swt.binaries \ + eclipse-platform:eclipse.platform.team:${ECLIPSE_TAG}:o/eclipse.platform.team \ + eclipse-platform:eclipse.platform.text:${ECLIPSE_TAG}:p/eclipse.platform.text \ + eclipse-platform:eclipse.platform.ua:${ECLIPSE_TAG}:q/eclipse.platform.ua \ + eclipse-platform:eclipse.platform.ui:${ECLIPSE_TAG}:r/eclipse.platform.ui \ + eclipse-platform:eclipse.platform.ui.tools:${ECLIPSE_TAG}:s/eclipse.platform.ui.tools \ + eclipse-equinox:equinox.binaries:${ECLIPSE_TAG}:t/rt.equinox.binaries \ + eclipse-equinox:equinox.bundles:${ECLIPSE_TAG}:u/rt.equinox.bundles \ + eclipse-equinox:equinox.framework:${ECLIPSE_TAG}:v/rt.equinox.framework \ + eclipse-equinox:p2:${ECLIPSE_TAG}:w/rt.equinox.p2 \ + daemonblade:eclipse-maven-repo:${PORTVERSION}:x USE_JAVA= 11+ @@ -80,9 +64,7 @@ DESKTOP_ENTRIES="Eclipse" \ SUB_FILES= ${PORTNAME} MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome -MAVEN_ECLIPSE= -Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION} \ - -Dlocal.cefsource=${WRKDIR}/${CEF_FILE} \ - -Dlocal.patchfiles=${FILESDIR} \ +MAVEN_ECLIPSE= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION} \ -Dnative=gtk.freebsd.${ARCH} \ -DforceContextQualifier=v${ECLIPSE_TSTAMP} diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo index 1cd0b55da1db..2698f806125c 100644 --- a/java/eclipse/distinfo +++ b/java/eclipse/distinfo @@ -1,55 +1,51 @@ -TIMESTAMP = 1653887228 -SHA256 (eclipse/eclipse.jdt-R4_21.tar.xz) = 8b1af3b43f76d3cc74fb44b15574fe2744bd5282e7e1c2290b779eeebfc94dfc -SIZE (eclipse/eclipse.jdt-R4_21.tar.xz) = 29324 -SHA256 (eclipse/eclipse.jdt.core-R4_21.tar.xz) = 5df3da6d88d68c433cc3ed0b8de62a7ccc481b6bbe7434e156230747a8611c46 -SIZE (eclipse/eclipse.jdt.core-R4_21.tar.xz) = 8815900 -SHA256 (eclipse/eclipse.jdt.core.binaries-R4_21.tar.xz) = d9632f5086217d780d8eebea0da75607272002fee5cd22f3cec8c08fee00c6c6 -SIZE (eclipse/eclipse.jdt.core.binaries-R4_21.tar.xz) = 34416428 -SHA256 (eclipse/eclipse.jdt.debug-R4_21.tar.xz) = 7910a349bb0afaa3a98b65be959d0ae47da745f3c96a183f2b2e2e5eb585dd04 -SIZE (eclipse/eclipse.jdt.debug-R4_21.tar.xz) = 1469208 -SHA256 (eclipse/eclipse.jdt.ui-R4_21.tar.xz) = cb6d963ab0422523897fade2f79be0807f7abe709a4a9bdbd5d027694179daea -SIZE (eclipse/eclipse.jdt.ui-R4_21.tar.xz) = 16293416 -SHA256 (eclipse/eclipse.pde.build-R4_21.tar.xz) = ff32409190bcaa29b8fda76eee98cfa3e3e117ec73e8043f9d2c56209108f033 -SIZE (eclipse/eclipse.pde.build-R4_21.tar.xz) = 847516 -SHA256 (eclipse/eclipse.pde.ui-R4_21.tar.xz) = 92e4305b0d2de70c1c866ba35f2c5d79f6335d4c8d5b828926ea20a729e7b6ae -SIZE (eclipse/eclipse.pde.ui-R4_21.tar.xz) = 25742828 -SHA256 (eclipse/eclipse.platform-R4_21.tar.xz) = 7b3cc0234f4dc9d4a9d56dc4550dd0cfa21263eb89ca221ce2eb22c258795535 -SIZE (eclipse/eclipse.platform-R4_21.tar.xz) = 1314336 -SHA256 (eclipse/eclipse.platform.common-R4_21.tar.xz) = 38e7a3e41977037d74ab14c9c5e5a471a6a9f593f133f72981b7850d199d6f53 -SIZE (eclipse/eclipse.platform.common-R4_21.tar.xz) = 33482124 -SHA256 (eclipse/eclipse.platform.debug-R4_21.tar.xz) = fd4d24ad9ab36a9d8c9a17492608156508862596f304a21a32a877adf9133493 -SIZE (eclipse/eclipse.platform.debug-R4_21.tar.xz) = 1524768 -SHA256 (eclipse/eclipse.platform.releng-R4_21.tar.xz) = 63fb661948e191ed0c96a7149f4e4c6f7b9536360fced8321d5d208c500fe1ed -SIZE (eclipse/eclipse.platform.releng-R4_21.tar.xz) = 154672 -SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_21.tar.xz) = 2774ce3870d27d95bcecc3e9ab04de649a27b3bbcf9111c828b17a80fc639d9a -SIZE (eclipse/eclipse.platform.releng.aggregator-R4_21.tar.xz) = 611344 -SHA256 (eclipse/eclipse.platform.resources-R4_21.tar.xz) = 643f2ac4bd62f1747f3e30ffe09043d96cb92f32b7e943dddad0fd24f87dc370 -SIZE (eclipse/eclipse.platform.resources-R4_21.tar.xz) = 826960 -SHA256 (eclipse/eclipse.platform.runtime-R4_21.tar.xz) = 8ea6339fa54edf08cb0c66e4a1e664f3ddcd688fd05453e7d202373c29b4898d -SIZE (eclipse/eclipse.platform.runtime-R4_21.tar.xz) = 431772 -SHA256 (eclipse/eclipse.platform.swt-R4_21.tar.xz) = d6f2c36267809c04717e5951cdcceaf102892580e0a5e887eb79e0b49d5c9113 -SIZE (eclipse/eclipse.platform.swt-R4_21.tar.xz) = 6395368 -SHA256 (eclipse/eclipse.platform.swt.binaries-R4_21.tar.xz) = d43e8322b90af3bebdd9ed19b318e760915d7ce8f59d9c530397c7e7b4d40b29 -SIZE (eclipse/eclipse.platform.swt.binaries-R4_21.tar.xz) = 2250692 -SHA256 (eclipse/eclipse.platform.team-R4_21.tar.xz) = fe57896e30e148938547fc0fc4cf23033ce9fdf6db1a9192dbd6b7b49af8c963 -SIZE (eclipse/eclipse.platform.team-R4_21.tar.xz) = 4564772 -SHA256 (eclipse/eclipse.platform.text-R4_21.tar.xz) = 6e2b1c4252786c995d79d14504195a64a46a4a335e2f4a27b3ddb9e9cfeadaf9 -SIZE (eclipse/eclipse.platform.text-R4_21.tar.xz) = 1333172 -SHA256 (eclipse/eclipse.platform.ua-R4_21.tar.xz) = 53fb7f58195767221cc7ef579a0d758fd5cc4c4627d722b60122afff5565a5f4 -SIZE (eclipse/eclipse.platform.ua-R4_21.tar.xz) = 4654924 -SHA256 (eclipse/eclipse.platform.ui-R4_21.tar.xz) = 45f7abbb7546f009ac7b85935ed3f0f713ab64cd43c39fba4919bae3c62c8c42 -SIZE (eclipse/eclipse.platform.ui-R4_21.tar.xz) = 5816708 -SHA256 (eclipse/eclipse.platform.ui.tools-R4_21.tar.xz) = ad9d54fc2f7b0c87e73edf142310647cc81aebfa08e40263b949a57a337aeab4 -SIZE (eclipse/eclipse.platform.ui.tools-R4_21.tar.xz) = 329028 -SHA256 (eclipse/rt.equinox.binaries-R4_21.tar.xz) = 6dcebfcbf005d49f60b153ec256dacaf199acda3e6c627b0aac03f241a1738b7 -SIZE (eclipse/rt.equinox.binaries-R4_21.tar.xz) = 446104 -SHA256 (eclipse/rt.equinox.bundles-R4_21.tar.xz) = 69e9af9d8e297fe19d1c5a0a624d8f5c6fe81f53614f8cbdb42b4f78eb3097c6 -SIZE (eclipse/rt.equinox.bundles-R4_21.tar.xz) = 1154508 -SHA256 (eclipse/rt.equinox.framework-R4_21.tar.xz) = 5b2de266aba0fe7a6245c34357f163b9156806697ded80ecd59611b77bf5990c -SIZE (eclipse/rt.equinox.framework-R4_21.tar.xz) = 1438564 -SHA256 (eclipse/rt.equinox.p2-R4_21.tar.xz) = be31e8cff1af6703c283c0df1c0902e8b8efff07d4dd9d9fa3bccc0773c28b1a -SIZE (eclipse/rt.equinox.p2-R4_21.tar.xz) = 48558608 -SHA256 (eclipse/cef_binary_3.3071.1649.g98725e6_linux64_minimal.tar.bz2) = 7eea540d122ceb35a0ce1970e72077b861e23ffbbe55288522b57141934f86f2 -SIZE (eclipse/cef_binary_3.3071.1649.g98725e6_linux64_minimal.tar.bz2) = 143099195 -SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.21_GH0.tar.gz) = 6c9267690fedd16d5b6ff069759cff74206643f51db79e2ad469d4c2bb60c4ed -SIZE (eclipse/daemonblade-eclipse-maven-repo-4.21_GH0.tar.gz) = 226452400 +TIMESTAMP = 1656038535 +SHA256 (eclipse/eclipse-platform-eclipse.platform.releng.aggregator-4.24-R4_24_GH0.tar.gz) = 8adf38e43f12548a905bc04ca4991e144dcefc074b8484019f982e8473258b02 +SIZE (eclipse/eclipse-platform-eclipse.platform.releng.aggregator-4.24-R4_24_GH0.tar.gz) = 689841 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_24_GH0.tar.gz) = a39673bfde615e257d7e038ef66800dd5946f042b18ddf44abcaf37010daa57a +SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_24_GH0.tar.gz) = 39265 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_24_GH0.tar.gz) = 65ca38c7c9ec833c8a0a09147a3a64a7741323222607d6048d5c6397e7359f5f +SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_24_GH0.tar.gz) = 13427635 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_24_GH0.tar.gz) = 948200cfc5578c317611c3633d90aefbe129488e4ea3a64c256e364e290e31e8 +SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_24_GH0.tar.gz) = 34886516 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_24_GH0.tar.gz) = 952c6e6cbe4bc8e940852b1cf4096a737bea638ab61d769e6483f12c06a1fef4 +SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_24_GH0.tar.gz) = 2109736 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_24_GH0.tar.gz) = 2fa4f4f503525dad5d2cee0963059852681d037a7de32234562e02d20c86df27 +SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_24_GH0.tar.gz) = 21833971 +SHA256 (eclipse/eclipse-pde-eclipse.pde-R4_24_GH0.tar.gz) = 74445fbdd607d7338c8027d7dd0907842fb19f9d4eda50308578651ca39e1231 +SIZE (eclipse/eclipse-pde-eclipse.pde-R4_24_GH0.tar.gz) = 29186052 +SHA256 (eclipse/eclipse-platform-eclipse.platform-R4_24_GH0.tar.gz) = e6c8508ca0c96c140625f6704be09a91c165cc26f6d80a3f24c98e06232e62f3 +SIZE (eclipse/eclipse-platform-eclipse.platform-R4_24_GH0.tar.gz) = 3059267 +SHA256 (eclipse/eclipse-platform-eclipse.platform.common-R4_24_GH0.tar.gz) = 68edec94a3a7e82cf6aec782b30e421366618c30299e0ef33c439374b5536f9a +SIZE (eclipse/eclipse-platform-eclipse.platform.common-R4_24_GH0.tar.gz) = 29779908 +SHA256 (eclipse/eclipse-platform-eclipse.platform.debug-R4_24_GH0.tar.gz) = 2d2fbf81bbcfa2a6362bb8307309dff8fbb9f189acc0258bec5043213e54572d +SIZE (eclipse/eclipse-platform-eclipse.platform.debug-R4_24_GH0.tar.gz) = 2295169 +SHA256 (eclipse/eclipse-platform-eclipse.platform.releng-R4_24_GH0.tar.gz) = c86ca6261ebcdeefef503b67aebac0b876677ebdbfc4b74d09c761fb11b1d44e +SIZE (eclipse/eclipse-platform-eclipse.platform.releng-R4_24_GH0.tar.gz) = 205802 +SHA256 (eclipse/eclipse-platform-eclipse.platform.resources-R4_24_GH0.tar.gz) = 4e0d952381137163b2e434eac903042f19b590d1ab8774902cf7ffef042a1bd5 +SIZE (eclipse/eclipse-platform-eclipse.platform.resources-R4_24_GH0.tar.gz) = 1278451 +SHA256 (eclipse/eclipse-platform-eclipse.platform.runtime-fd42b6e331_GH0.tar.gz) = b93e7aefe4c0a588decf8dd840104fb3d54fdfef106e6d4af2c5950e9a3f94b7 +SIZE (eclipse/eclipse-platform-eclipse.platform.runtime-fd42b6e331_GH0.tar.gz) = 692044 +SHA256 (eclipse/eclipse-platform-eclipse.platform.swt-R4_24_GH0.tar.gz) = 00ee208888bea89031c592ae070b3911194893e60f46eb89b87373ad65039f10 +SIZE (eclipse/eclipse-platform-eclipse.platform.swt-R4_24_GH0.tar.gz) = 8904984 +SHA256 (eclipse/eclipse-platform-eclipse.platform.swt.binaries-R4_24_GH0.tar.gz) = 4dc1ac798f44081a2db76652147cb9e348db55af8fb0022efc8f1dd8fc4776be +SIZE (eclipse/eclipse-platform-eclipse.platform.swt.binaries-R4_24_GH0.tar.gz) = 1809506 +SHA256 (eclipse/eclipse-platform-eclipse.platform.team-R4_24_GH0.tar.gz) = f61f18527ee7baad5d9122c424ab6f146fae9f5ec81db127116230ac5156905a +SIZE (eclipse/eclipse-platform-eclipse.platform.team-R4_24_GH0.tar.gz) = 1738853 +SHA256 (eclipse/eclipse-platform-eclipse.platform.text-R4_24_GH0.tar.gz) = c4ee6f5f54229f88a54c2b564038b49760f92f4d12ebbef8daf0d601046dcec2 +SIZE (eclipse/eclipse-platform-eclipse.platform.text-R4_24_GH0.tar.gz) = 2052540 +SHA256 (eclipse/eclipse-platform-eclipse.platform.ua-R4_24_GH0.tar.gz) = 7450f5e85cd0b525c0f3ad62aeecf36a5e6c8591f9a3d4d786aa2d41b9f7350e +SIZE (eclipse/eclipse-platform-eclipse.platform.ua-R4_24_GH0.tar.gz) = 5646278 +SHA256 (eclipse/eclipse-platform-eclipse.platform.ui-R4_24_GH0.tar.gz) = d44eedcbe7fc97b3a3cae711257f6f7672618deed3a3e90e8ca229985409d614 +SIZE (eclipse/eclipse-platform-eclipse.platform.ui-R4_24_GH0.tar.gz) = 8917607 +SHA256 (eclipse/eclipse-platform-eclipse.platform.ui.tools-R4_24_GH0.tar.gz) = 64db26e499af59326c1ba51a3a3bc7f25788aadd4ce772ba2e040b56a8a9c8f6 +SIZE (eclipse/eclipse-platform-eclipse.platform.ui.tools-R4_24_GH0.tar.gz) = 502460 +SHA256 (eclipse/eclipse-equinox-equinox.binaries-R4_24_GH0.tar.gz) = 68f7629da546627397279f587523aed11f77def055735616dd9a512feba3a82b +SIZE (eclipse/eclipse-equinox-equinox.binaries-R4_24_GH0.tar.gz) = 894583 +SHA256 (eclipse/eclipse-equinox-equinox.bundles-R4_24_GH0.tar.gz) = befe93800fcd86aba752d829bfb826db5a09f92f5ef29afedff79134174ff39e +SIZE (eclipse/eclipse-equinox-equinox.bundles-R4_24_GH0.tar.gz) = 1646631 +SHA256 (eclipse/eclipse-equinox-equinox.framework-R4_24_GH0.tar.gz) = 98ecb20567c10cb21b90cc0b47ff1fb768d6d3da4e0a11930af60de29fdc9f45 +SIZE (eclipse/eclipse-equinox-equinox.framework-R4_24_GH0.tar.gz) = 1937236 +SHA256 (eclipse/eclipse-equinox-p2-R4_24_GH0.tar.gz) = 9730ef8f4807b0fd82e9115f56f30dba0aaf46f0e4b4df98f1406c30ca794f2b +SIZE (eclipse/eclipse-equinox-p2-R4_24_GH0.tar.gz) = 54122344 +SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.24_GH0.tar.gz) = 0949c61359f48aacc0a6c7c03b94cf94ebd0f73726144e616cfe59630d2a3d57 +SIZE (eclipse/daemonblade-eclipse-maven-repo-4.24_GH0.tar.gz) = 441108883 diff --git a/java/eclipse/files/cef-patch b/java/eclipse/files/cef-patch deleted file mode 100644 index 7ffd86d8053d..000000000000 --- a/java/eclipse/files/cef-patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/cmake/cef_variables.cmake ./cmake/cef_variables.cmake ---- ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/cmake/cef_variables.cmake 2017-07-19 17:50:42.000000000 +1200 -+++ ./cmake/cef_variables.cmake 2020-10-02 14:38:13.438964000 +1300 -@@ -16,7 +16,7 @@ - if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - set(OS_MACOSX 1) - set(OS_POSIX 1) --elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") -+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") - set(OS_LINUX 1) - set(OS_POSIX 1) - elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") -diff -ruN ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/include/base/cef_build.h ./include/base/cef_build.h ---- ../cef_binary_3.3071.1649.g98725e6_linux64_minimal.orig/include/base/cef_build.h 2017-07-19 17:50:42.000000000 +1200 -+++ ./include/base/cef_build.h 2020-10-02 14:43:29.023692000 +1300 -@@ -47,7 +47,7 @@ - #ifndef OS_MACOSX - #define OS_MACOSX 1 - #endif --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - #ifndef OS_LINUX - #define OS_LINUX 1 - #endif diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in index 756e4a5fbd8f..491694fe88fe 100644 --- a/java/eclipse/files/eclipse.in +++ b/java/eclipse/files/eclipse.in @@ -7,6 +7,8 @@ # Create required Webkit communication directories removed by: # https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/163641/ +# The changeset makes use of dbus "abstract" socket feature which is +# only available on Linux. for D in SWT-GDBusServer SWT-WebExtensionGDBusServer do mkdir -p /tmp/${D} diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent index be14b1964bd7..ee6b0852f552 100644 --- a/java/eclipse/files/patch-eclipse-platform-parent +++ b/java/eclipse/files/patch-eclipse-platform-parent @@ -1,19 +1,19 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml --- eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -81,9 +81,9 @@ +@@ -77,9 +77,9 @@ 'eclipiserun-repo' repository, such as for computing .api-descriptions and generating API Tools reports. --> -- https://download.eclipse.org/eclipse/updates/4.21-I-builds/ -+ https://download.eclipse.org/eclipse/updates/4.21/ +- https://download.eclipse.org/eclipse/updates/4.24-I-builds/ ++ https://download.eclipse.org/eclipse/updates/4.24/ -- https://download.eclipse.org/eclipse/updates/4.21-I-builds -+ https://download.eclipse.org/eclipse/updates/4.21 +- https://download.eclipse.org/eclipse/updates/4.24-I-builds ++ https://download.eclipse.org/eclipse/updates/4.24 https://repo.eclipse.org/content/repositories/tycho-snapshots/ -@@ -257,17 +257,22 @@ +@@ -253,17 +253,22 @@ @@ -41,12 +41,12 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml gtk aarch64 -@@ -624,7 +629,7 @@ +@@ -625,7 +630,7 @@ For maintenance streams should always be "M-builds". Ideally, this value would be provided by the environment, see bug 489789. --> -- https://download.eclipse.org/eclipse/updates/4.21-I-builds -+ https://download.eclipse.org/eclipse/updates/4.21 +- https://download.eclipse.org/eclipse/updates/4.24-I-builds ++ https://download.eclipse.org/eclipse/updates/4.24 diff --git a/java/eclipse/files/patch-eclipse.pde b/java/eclipse/files/patch-eclipse.pde new file mode 100644 index 000000000000..714dc2717561 --- /dev/null +++ b/java/eclipse/files/patch-eclipse.pde @@ -0,0 +1,146 @@ +diff -ru eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml +--- eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -59,10 +59,10 @@ + + + +- +- ++ ++ + +- ++ + + + +diff -ru eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java +--- eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 +@@ -694,7 +694,7 @@ + arguments.add("-sf"); //$NON-NLS-1$ + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ + arguments.clear(); + } + } +diff -ru eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java +--- eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 +@@ -912,7 +912,7 @@ + for (int i = 0; i < links.length; i += 2) { + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ + arguments.clear(); + } + } +diff -ru eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java +--- eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 +@@ -308,8 +308,8 @@ + return "Windows"; //$NON-NLS-1$ + if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$ + return "Mac"; //$NON-NLS-1$ +- if ("linux".equalsIgnoreCase(os)) //$NON-NLS-1$ +- return "Linux"; //$NON-NLS-1$ ++ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ ++ return "FreeBSD"; //$NON-NLS-1$ + if ("solaris".equalsIgnoreCase(os)) //$NON-NLS-1$ + return "Solaris"; //$NON-NLS-1$ + if ("hpux".equalsIgnoreCase(os)) //$NON-NLS-1$ +diff -ru eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml +--- eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -19,9 +19,9 @@ + + + +- ++ + +- ++ + + + +diff -ru eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties +--- eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 +@@ -19,4 +19,4 @@ + root.permissions.755=eclipse,*.so* + + root.win32.win32.x86_64=eclipse.exe, eclipsec.exe +-root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm ++root.freebsd.gtk.amd64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm +diff -ru eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java +--- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java 0000-00-00 00:00:00.000000000 +0000 +@@ -56,8 +56,8 @@ + private FormEntry fCustomEntry; + private boolean fBlockChanges; + +- private static final String[] TAB_LABELS = { "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ +- private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; ++ private static final String[] TAB_LABELS = { "freebsd", "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ private static final String[] TAB_OS = { Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; + + private CTabFolder fTabFolder; + private int fLastTab; +diff -ru eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java +--- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java 0000-00-00 00:00:00.000000000 +0000 +@@ -69,8 +69,8 @@ + private ComboViewerPart fEEsCombo; + private boolean fBlockChanges; + +- private static final String[] TAB_LABELS = { "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ +- private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; ++ private static final String[] TAB_LABELS = { "freebsd", "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ private static final String[] TAB_OS = { Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; + + private CTabFolder fTabFolder; + private int fLastTab; +diff -ru eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java +--- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 0000-00-00 00:00:00.000000000 +0000 +@@ -130,7 +130,7 @@ + implementation.setName("implementation"); //$NON-NLS-1$ + implementation.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$ + implementation.setAttribute("style", "content/shared.css"); //$NON-NLS-1$ //$NON-NLS-2$ +- implementation.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ ++ implementation.setAttribute("os", "freebsd,win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ + + presentation.add(implementation); + +diff -ru eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java +--- eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java 0000-00-00 00:00:00.000000000 +0000 +@@ -162,7 +162,7 @@ + presentationElement.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$ + IPluginElement implementationElement = factory.createElement(presentationElement); + implementationElement.setName("implementation"); //$NON-NLS-1$ +- implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ ++ implementationElement.setAttribute("os", "freebsd,win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ + if (getTargetVersion() == 3.0) + implementationElement.setAttribute("style", "content/shared.css"); //$NON-NLS-1$//$NON-NLS-2$ + +diff -ru eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product +--- eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 +@@ -84,8 +84,9 @@ + + + +- +- ++ ++ ++ + + + diff --git a/java/eclipse/files/patch-eclipse.pde.build b/java/eclipse/files/patch-eclipse.pde.build deleted file mode 100644 index 212fdd5a956a..000000000000 --- a/java/eclipse/files/patch-eclipse.pde.build +++ /dev/null @@ -1,53 +0,0 @@ -diff -ru eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml ---- eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -59,10 +59,10 @@ - - - -- -- -+ -+ - -- -+ - - - -diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java ---- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 -@@ -694,7 +694,7 @@ - arguments.add("-sf"); //$NON-NLS-1$ - arguments.add(links[i]); - arguments.add(links[i + 1]); -- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ -+ script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ - arguments.clear(); - } - } -diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java ---- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 -@@ -912,7 +912,7 @@ - for (int i = 0; i < links.length; i += 2) { - arguments.add(links[i]); - arguments.add(links[i + 1]); -- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ -+ script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ - arguments.clear(); - } - } -diff -ru eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java ---- eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 -@@ -306,6 +306,8 @@ - private String convertOS(String os) { - if (os == null) - return null; -+ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ -+ return "FreeBSD"; //$NON-NLS-1$ - if ("win32".equalsIgnoreCase(os)) //$NON-NLS-1$ - return "Windows"; //$NON-NLS-1$ - if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$ diff --git a/java/eclipse/files/patch-eclipse.pde.ui b/java/eclipse/files/patch-eclipse.pde.ui deleted file mode 100644 index 9a9ec2111d40..000000000000 --- a/java/eclipse/files/patch-eclipse.pde.ui +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product ---- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 -@@ -82,8 +82,9 @@ - - - -- -- -+ -+ -+ - - - diff --git a/java/eclipse/files/patch-eclipse.platform.releng b/java/eclipse/files/patch-eclipse.platform.releng index 99d130993e82..71456e76cf08 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng +++ b/java/eclipse/files/patch-eclipse.platform.releng @@ -12,20 +12,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x download-size="0" install-size="0" version="0.0.0" -@@ -105,9 +105,9 @@ - unpack="false"/> - - -+ + - + - - mirror-build generate-resources @@ -128,7 +128,7 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository -@@ -402,7 +404,7 @@ +@@ -392,7 +394,7 @@ zip @@ -238,7 +238,7 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.re +--> eclipse.platform.repository - + diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties --- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 diff --git a/java/eclipse/files/patch-eclipse.platform.resources b/java/eclipse/files/patch-eclipse.platform.resources index 0cc9c1752db8..b295843976a2 100644 --- a/java/eclipse/files/patch-eclipse.platform.resources +++ b/java/eclipse/files/patch-eclipse.platform.resources @@ -57,16 +57,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ + 4.24.0-SNAPSHOT ../../ - org.eclipse.core - org.eclipse.core.filesystem.linux.aarch64 + org.eclipse.core.filesystem.freebsd.aarch64 1.4.100-SNAPSHOT eclipse-plugin -@@ -37,7 +37,7 @@ +@@ -36,7 +36,7 @@ p2 @@ -114,16 +114,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ + 4.24.0-SNAPSHOT ../../ - org.eclipse.core - org.eclipse.core.filesystem.linux.x86_64 + org.eclipse.core.filesystem.freebsd.amd64 1.2.300-SNAPSHOT eclipse-plugin -@@ -33,9 +33,9 @@ +@@ -32,9 +32,9 @@ p2 @@ -135,7 +135,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. -@@ -50,7 +50,7 @@ +@@ -49,7 +49,7 @@ native @@ -144,7 +144,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. -@@ -63,10 +63,10 @@ +@@ -62,10 +62,10 @@ process-resources @@ -198,16 +198,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ + 4.24.0-SNAPSHOT ../../ - org.eclipse.core - org.eclipse.core.filesystem.linux.ppc64le + org.eclipse.core.filesystem.freebsd.powerpc64 1.4.100-SNAPSHOT eclipse-plugin -@@ -37,9 +37,9 @@ +@@ -36,9 +36,9 @@ p2 @@ -258,16 +258,16 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ + 4.24.0-SNAPSHOT ../../ - org.eclipse.core - org.eclipse.core.filesystem.linux.ppc64le + org.eclipse.core.filesystem.freebsd.powerpc64le 1.4.100-SNAPSHOT eclipse-plugin -@@ -37,9 +37,9 @@ +@@ -36,9 +36,9 @@ p2 diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt index ed7904588c77..dc00b69720aa 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt +++ b/java/eclipse/files/patch-eclipse.platform.swt @@ -36,7 +36,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/ecli diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 -@@ -65,12 +65,12 @@ +@@ -63,12 +63,12 @@ static String arch() { String osArch = System.getProperty("os.arch"); //$NON-NLS-1$ @@ -115,53 +115,32 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library "linux.x86_64") if [ "${CC}" = "" ]; then export CC=gcc -@@ -148,7 +158,7 @@ +@@ -159,7 +169,7 @@ # For 64-bit CPUs, we have a switch --if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then -+if [ ${MODEL} = 'amd64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'aarch64' ]; then +-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ]; then ++if [ ${MODEL} = 'amd64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then XLIB64=-L/usr/X11R6/lib64 -@@ -160,6 +170,11 @@ +@@ -170,6 +180,11 @@ + XLIB64="${XLIB64} -L/usr/lib64" SWT_LFLAGS=-m64 export SWT_LFLAGS - fi ++ fi + if [ ${SWT_OS} = "freebsd" ] + then + SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64" + export SWT_LFLAGS=-m64 -+ fi + fi export SWT_PTR_CFLAGS fi - -@@ -275,10 +290,10 @@ - - func_build_chromium () { - func_echo_plus "Building Chromium bindings:" -- if [ -d "chromium_subp/cef_linux" ]; then -- export CHROMIUM_HEADERS=./chromium_subp/cef_linux -+ if [ -d "chromium_subp/cef_freebsd" ]; then -+ export CHROMIUM_HEADERS=./chromium_subp/cef_freebsd - else -- export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_linux -+ export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_freebsd - fi - ${MAKE_TYPE} -f $MAKEFILE "${@}" - RETURN_VALUE=$? #make can return 1 or 2 if it fails. Thus need to cache it in case it's used programmatically somewhere. -@@ -332,4 +347,4 @@ - elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then - export GTK_VERSION="3.0" - func_build_gtk3 "$@" --fi -\ No newline at end of file -+fi diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 -@@ -113,16 +113,18 @@ - CHROMIUM_OBJECTS = chromiumlib.o chromiumlib_structs.o chromiumlib_custom.o chromiumlib_stats.o +@@ -98,16 +98,18 @@ + WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o +port_prefix=`pkg-config --variable=prefix gtk+-3.0` @@ -182,17 +161,6 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library # Treat all warnings as errors. If your new code produces a warning, please # take time to properly understand and fix/silence it as necessary. -@@ -303,10 +305,6 @@ - cp $(ALL_SWT_LIBS) $(OUTPUT_DIR) - ifeq ($(BUILD_WEBKIT2EXTENSION),yes) - @# Copy webextension into it's own folder, but create folder first. -- @# CAREFULLY delete '.so' files inside webextension*. Then carefully remove the directories. 'rm -rf' seemed too risky of an approach. -- @-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so)" ] && rm -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so` -- @-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*)" ] && rmdir -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*` -- - @# Copying webextension is not critical for build to succeed, thus we use '-'. SWT can still function without a webextension. - @-[ -d $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) ] || mkdir -v $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) # If folder does not exist, make it. - -cp $(WEBKIT_EXTENSION_LIB) $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)/ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000 @@ -210,7 +178,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 -@@ -121,7 +121,7 @@ +@@ -114,7 +114,7 @@ * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/ * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript */ @@ -251,34 +219,34 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.pl diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml --- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -68,17 +68,21 @@ +@@ -67,17 +67,21 @@ - + - + - + - + - + - + -+ ++ + + + -@@ -89,13 +93,13 @@ +@@ -88,13 +92,13 @@ - + - + @@ -292,303 +260,10 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platf -@@ -372,7 +376,7 @@ - - - -- -+ - - - -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -5,6 +5,6 @@ - Bundle-SymbolicName: org.eclipse.swt.browser.chromium;singleton:=true - Bundle-Version: 3.116.0.qualifier - Bundle-ManifestVersion: 2 --Eclipse-PlatformFilter: (osgi.arch=x86_64) --SWT-Arch: x86_64 -+Eclipse-PlatformFilter: (osgi.arch=amd64) -+SWT-Arch: amd64 - Automatic-Module-Name: org.eclipse.swt.browser.chromium -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 -@@ -10,6 +10,6 @@ - requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) - - requires.3.namespace = org.eclipse.equinox.p2.iu --requires.3.name = org.eclipse.swt.browser.chromium.gtk.linux.x86_64 -+requires.3.name = org.eclipse.swt.browser.chromium.gtk.freebsd.amd64 - requires.3.range = [$version$,$version$] --requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) -+requires.3.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=amd64)(!(org.eclipse.swt.buildtime=true))) -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -36,12 +36,10 @@ - - - -- -- -- -- -- -- -+ -+ -+ -+ - - - -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs 0000-00-00 00:00:00.000000000 +0000 -@@ -38,8 +38,8 @@ - if cfg!(target_os = "macos") { - cef_path.push("cef_macosx"); - } -- else if cfg!(target_os = "linux") { -- cef_path.push("cef_linux"); -+ else if cfg!(target_os = "freebsd") { -+ cef_path.push("cef_freebsd"); - } - else if cfg!(target_os = "windows") { - if std::env::var("CARGO_CFG_TARGET_ARCH").unwrap() == "x86" { -@@ -58,11 +58,12 @@ - panic!("cargo:warning=Extract and rename cef binary (minimal) distro to {:?}", cef_path); - } - -- if cfg!(target_os = "linux") { -+ if cfg!(target_os = "freebsd") { - // println!("cargo:rustc-link-lib=gtk-x11-2.0"); - // println!("cargo:rustc-link-lib=gdk-x11-2.0"); - // println!("cargo:rustc-link-lib=gtk-3.so.0"); - println!("cargo:rustc-link-lib=X11"); -+ println!("cargo:rustc-link-search=/usr/local/lib"); - } - - // Tell cargo to tell rustc to link the system shared library. -@@ -97,14 +98,14 @@ - } - - #[cfg(feature = "gen")] --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - fn gen_os(cef_path: std::path::Display) { - let _ = generator(cef_path) - .header("cef_linux.h") - .whitelist_type("_cef_main_args_t") - .whitelist_type("_cef_window_info_t") - .whitelist_function("cef_get_xdisplay") -- .generate().expect("Failed to gencef linux") -+ .generate().expect("Failed to gencef freebsd") - .write_to_file(std::path::Path::new("src").join("cef").join("linux.rs")); - } - -@@ -126,7 +127,7 @@ - fn gen_cef(cef_path: std::path::Display) { - use std::io::Write; - #[cfg(target_os = "windows")] let gen = generator(cef_path).header("include/internal/cef_types_win.h"); -- #[cfg(target_os = "linux")] let gen = generator(cef_path).header("include/internal/cef_types_linux.h"); -+ #[cfg(target_os = "freebsd")] let gen = generator(cef_path).header("include/internal/cef_types_linux.h"); - #[cfg(target_os = "macos")] let gen = generator(cef_path).header("include/internal/cef_types_mac.h"); - let generated = gen - .header("cef.h") -@@ -166,14 +167,14 @@ - .blacklist_type(".*XDisplay") - .blacklist_type("VisualID") - .blacklist_type(".*XEvent") -- .raw_line("#[cfg(target_os = \"linux\")] pub mod linux;") -- .raw_line("#[cfg(target_os = \"linux\")] pub use self::linux::_cef_window_info_t;") -- .raw_line("#[cfg(target_os = \"linux\")] pub use self::linux::_cef_main_args_t;") -- .raw_line("#[cfg(target_os = \"linux\")] pub type wchar_t = i32;") -- .raw_line("#[cfg(target_os = \"linux\")] pub type char16 = i32;") -- .raw_line("#[cfg(target_os = \"linux\")] pub type time_t = isize;") -- .raw_line("#[cfg(target_os = \"linux\")] pub type int64 = ::std::os::raw::c_longlong;") -- .raw_line("#[cfg(target_os = \"linux\")] pub type uint64 = ::std::os::raw::c_ulonglong;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub mod linux;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub use self::linux::_cef_window_info_t;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub use self::linux::_cef_main_args_t;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type wchar_t = i32;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type char16 = i32;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type time_t = isize;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type int64 = ::std::os::raw::c_longlong;") -+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type uint64 = ::std::os::raw::c_ulonglong;") - .raw_line("#[cfg(target_os = \"macos\")] pub mod mac;") - .raw_line("#[cfg(target_os = \"macos\")] pub use self::mac::_cef_window_info_t;") - .raw_line("#[cfg(target_os = \"macos\")] pub use self::mac::_cef_main_args_t;") -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs 0000-00-00 00:00:00.000000000 +0000 -@@ -16,14 +16,14 @@ - #![allow(non_snake_case)] - #![allow(non_camel_case_types)] - #![allow(non_upper_case_globals)] --#[cfg(target_os = "linux")] pub mod linux; --#[cfg(target_os = "linux")] pub use self::linux::_cef_window_info_t; --#[cfg(target_os = "linux")] pub use self::linux::_cef_main_args_t; --#[cfg(target_os = "linux")] pub type wchar_t = i32; --#[cfg(target_os = "linux")] pub type char16 = i32; --#[cfg(target_os = "linux")] pub type time_t = isize; --#[cfg(target_os = "linux")] pub type int64 = ::std::os::raw::c_longlong; --#[cfg(target_os = "linux")] pub type uint64 = ::std::os::raw::c_ulonglong; -+#[cfg(target_os = "freebsd")] pub mod linux; -+#[cfg(target_os = "freebsd")] pub use self::linux::_cef_window_info_t; -+#[cfg(target_os = "freebsd")] pub use self::linux::_cef_main_args_t; -+#[cfg(target_os = "freebsd")] pub type wchar_t = i32; -+#[cfg(target_os = "freebsd")] pub type char16 = i32; -+#[cfg(target_os = "freebsd")] pub type time_t = isize; -+#[cfg(target_os = "freebsd")] pub type int64 = ::std::os::raw::c_longlong; -+#[cfg(target_os = "freebsd")] pub type uint64 = ::std::os::raw::c_ulonglong; - #[cfg(target_os = "macos")] pub mod mac; - #[cfg(target_os = "macos")] pub use self::mac::_cef_window_info_t; - #[cfg(target_os = "macos")] pub use self::mac::_cef_main_args_t; -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml 0000-00-00 00:00:00.000000000 +0000 -@@ -15,7 +15,7 @@ - [dependencies] - chromium = { path = "../chromium_subp/" } - --[target.'cfg(target_os = "linux")'.dependencies] -+[target.'cfg(target_os = "freebsd")'.dependencies] - x11 = "2.17.0" - - [target.'cfg(unix)'.dependencies] -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs 0000-00-00 00:00:00.000000000 +0000 -@@ -12,7 +12,7 @@ - ********************************************************************************/ - use cef; - use utils; --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - use gtk; - - use std::os::raw::{c_int, c_void}; -@@ -76,7 +76,7 @@ - browser - } - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - fn override_system_visual(visual: *mut c_void) { - unsafe { - let xvisual = gtk::gdk_x11_visual_get_xvisual(visual); -@@ -85,12 +85,12 @@ - } - } - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - extern "C" { - pub fn cef_override_system_visual(visual_id: std::os::raw::c_ulong); - } - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - fn cef_window_info(hwnd: *mut c_void, w: c_int, h: c_int) -> cef::_cef_window_info_t { - use std::os::raw::c_uint; - let window_info = unsafe { -@@ -112,7 +112,7 @@ - window_info - } - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - pub fn set_window_parent(window_info: *mut cef::_cef_window_info_t, hwnd: *mut c_void, x: c_int, y: c_int, w: c_int, h: c_int) { - use std::os::raw::c_uint; - //unsafe {println!("orig window_info {} {:?}", hwnd, (*window_info)); }; -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs ---- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs 0000-00-00 00:00:00.000000000 +0000 -@@ -12,7 +12,7 @@ - ********************************************************************************/ - extern crate chromium; - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - extern crate x11; - #[cfg(unix)] - extern crate nix; -@@ -25,21 +25,21 @@ - use chromium::socket; - - mod app; --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - mod gtk; - - use std::os::raw::{c_char, c_int, c_void}; - #[cfg(unix)] - use std::collections::HashMap; - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - unsafe extern fn xerror_handler_impl(_: *mut x11::xlib::Display, _event: *mut x11::xlib::XErrorEvent) -> c_int { - //print!("X error received: "); - //println!("type {}, serial {}, error_code {}, request_code {}, minor_code {}", - // (*event).type_, (*event).serial, (*event).error_code, (*event).request_code, (*event).minor_code); - 0 - } --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - unsafe extern fn xioerror_handler_impl(_: *mut x11::xlib::Display) -> c_int { - //println!("XUI error received"); - 0 -@@ -67,7 +67,7 @@ - if cfg!(target_family = "windows") { - set_env_var(cef_path, "PATH", ";"); - } -- if cfg!(target_os = "linux") { -+ if cfg!(target_os = "freebsd") { - set_env_var(cef_path, "LD_LIBRARY_PATH", ":"); - } - if cfg!(target_os = "macos") { -@@ -146,7 +146,7 @@ - }; - } - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - fn do_initialize(main_args: cef::_cef_main_args_t, settings: cef::_cef_settings_t, app_raw: *mut cef::_cef_app_t) { - unsafe { x11::xlib::XSetErrorHandler(Option::Some(xerror_handler_impl)) }; - unsafe { x11::xlib::XSetIOErrorHandler(Option::Some(xioerror_handler_impl)) }; -@@ -366,7 +366,7 @@ - do_resize(win_handle, width, height); - } - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - fn do_resize(win_handle: *mut c_void, width: i32, height: i32) { - use x11::xlib; - -@@ -642,7 +642,7 @@ - } - } - --#[cfg(target_os = "linux")] -+#[cfg(target_os = "freebsd")] - fn do_set_focus(parent: *mut c_void, _focus: i32) { - let root = unsafe { gtk::gtk_widget_get_toplevel(parent) }; - //println!("<<<<<<<< set_focus {} {:?} {:?}", focus, parent, root); -@@ -768,4 +768,4 @@ - #[no_mangle] - pub extern fn cefswt_go_back(browser: *mut cef::_cef_browser_t) { - unsafe { (*browser).go_back.expect("null go_back")(browser) }; --} -\ No newline at end of file -+} diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup --- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 -@@ -108,7 +108,7 @@ +@@ -91,7 +91,7 @@ xsi:type="predicates:NotPredicate"> unix @@ -637,50 +312,43 @@ diff -ru eclipse.platform.swt/pom.xml eclipse.platform.swt/pom.xml -+ ++--> - - -@@ -118,7 +119,9 @@ - examples/org.eclipse.swt.examples.ole.win32 - examples/org.eclipse.swt.examples.views - tests/org.eclipse.swt.tests.fragments.feature -+ - features/org.eclipse.swt.tools.feature - - -diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml ---- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -20,10 +20,10 @@ - - - - - + +@@ -122,17 +123,22 @@ + ${tycho.version} + + +- +- linux +- gtk +- x86_64 +- +- +- linux +- gtk +- ppc64le +- +- ++ ++ freebsd ++ gtk ++ amd64 ++ ++ ++ freebsd ++ gtk ++ powerpc64 ++ ++ ++ freebsd ++ gtk ++ powerpc64le ++ ++ + + + diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries index 1d925b76d229..730c72fa5c99 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt.binaries +++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries @@ -1,100 +1,3 @@ -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -@@ -1,6 +1,6 @@ - - -- org.eclipse.swt.browser.chromium.gtk.linux.x86_64 -+ org.eclipse.swt.browser.chromium.gtk.freebsd.amd64 - - - -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -2,11 +2,11 @@ - Fragment-Host: org.eclipse.swt;bundle-version="[3.116.0,4.0.0)" - Bundle-Name: Chromium SWT Widget for GTK - Bundle-Vendor: Eclipse.org --Bundle-SymbolicName: org.eclipse.swt.browser.chromium.gtk.linux.x86_64;singleton:=true -+Bundle-SymbolicName: org.eclipse.swt.browser.chromium.gtk.freebsd.amd64;singleton:=true - Bundle-Version: 3.117.0.qualifier - Bundle-ManifestVersion: 2 --Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) -+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64)) - SWT-WS: gtk --SWT-OS: linux --SWT-Arch: x86_64 --Automatic-Module-Name: org.eclipse.swt.browser.chromium.gtk.linux.x86_64 -+SWT-OS: freebsd -+SWT-Arch: amd64 -+Automatic-Module-Name: org.eclipse.swt.browser.chromium.gtk.freebsd.amd64 -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/build.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -11,11 +11,11 @@ - Contributors: - Guillermo Zunino, Equo - initial implementation - --> -- -+ - - -- -- -+ -+ - - - -@@ -26,7 +26,7 @@ - - - -- -+ - - - -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 @@ - ../binaries-parent/ - - org.eclipse.swt -- org.eclipse.swt.browser.chromium.gtk.linux.x86_64 -+ org.eclipse.swt.browser.chromium.gtk.freebsd.amd64 - 3.117.0-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk -- x86_64 -+ amd64 - ${buildId} - false - false -@@ -61,7 +61,7 @@ - - - org.eclipse.swt -- org.eclipse.swt.gtk.linux.x86_64 -+ org.eclipse.swt.gtk.freebsd.amd64 - ${project.version} - - -@@ -78,7 +78,7 @@ - - - native -- gtk.linux.x86_64 -+ gtk.freebsd.amd64 - - - diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -104,12 +7,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.aarch64; singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.aarch64; singleton:=true - Bundle-Version: 3.117.0.qualifier + Bundle-Version: 3.120.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment -@@ -26,8 +26,8 @@ - org.eclipse.swt.internal.cairo; x-internal:=true, - org.eclipse.swt.internal.gtk; x-internal:=true, +@@ -28,8 +28,8 @@ + org.eclipse.swt.internal.gtk3; x-internal:=true, + org.eclipse.swt.internal.gtk4; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64)) @@ -142,7 +45,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch org.eclipse.swt - org.eclipse.swt.gtk.linux.aarch64 + org.eclipse.swt.gtk.freebsd.aarch64 - 3.117.0-SNAPSHOT + 3.120.0-SNAPSHOT eclipse-plugin @@ -180,12 +83,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true - Bundle-Version: 3.117.0.qualifier + Bundle-Version: 3.120.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment -@@ -26,8 +26,8 @@ - org.eclipse.swt.internal.cairo; x-internal:=true, - org.eclipse.swt.internal.gtk; x-internal:=true, +@@ -28,8 +28,8 @@ + org.eclipse.swt.internal.gtk3; x-internal:=true, + org.eclipse.swt.internal.gtk4; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64)) @@ -238,7 +141,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 + org.eclipse.swt.gtk.freebsd.amd64 - 3.117.0-SNAPSHOT + 3.120.0-SNAPSHOT eclipse-plugin @@ -268,12 +171,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 3.117.0.qualifier + Bundle-Version: 3.120.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment -@@ -26,8 +26,8 @@ - org.eclipse.swt.internal.cairo; x-internal:=true, - org.eclipse.swt.internal.gtk; x-internal:=true, +@@ -28,8 +28,8 @@ + org.eclipse.swt.internal.gtk3; x-internal:=true, + org.eclipse.swt.internal.gtk4; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64)) @@ -309,7 +212,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc64le + org.eclipse.swt.gtk.freebsd.powerpc64 - 3.117.0-SNAPSHOT + 3.120.0-SNAPSHOT eclipse-plugin @@ -339,12 +242,12 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64le;singleton:=true - Bundle-Version: 3.117.0.qualifier + Bundle-Version: 3.120.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment -@@ -26,8 +26,8 @@ - org.eclipse.swt.internal.cairo; x-internal:=true, - org.eclipse.swt.internal.gtk; x-internal:=true, +@@ -28,8 +28,8 @@ + org.eclipse.swt.internal.gtk3; x-internal:=true, + org.eclipse.swt.internal.gtk4; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64le)) @@ -380,7 +283,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc64le + org.eclipse.swt.gtk.freebsd.powerpc64le - 3.117.0-SNAPSHOT + 3.120.0-SNAPSHOT eclipse-plugin diff --git a/java/eclipse/files/patch-eclipse.platform.team b/java/eclipse/files/patch-eclipse.platform.team index 034bb06eed8e..0ebf0de3dca1 100644 --- a/java/eclipse/files/patch-eclipse.platform.team +++ b/java/eclipse/files/patch-eclipse.platform.team @@ -18,7 +18,7 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/META-INF/MAN Bundle-Localization: fragment -Bundle-SymbolicName: org.eclipse.core.net.linux;singleton:=true +Bundle-SymbolicName: org.eclipse.core.net.freebsd;singleton:=true - Bundle-Version: 1.0.0.qualifier + Bundle-Version: 1.0.100.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" -Eclipse-PlatformFilter: (osgi.os=linux) +Eclipse-PlatformFilter: (osgi.os=freebsd) @@ -54,7 +54,7 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/pom.xml ecli org.eclipse.core - org.eclipse.core.net.linux + org.eclipse.core.net.freebsd - 1.0.0-SNAPSHOT + 1.0.100-SNAPSHOT eclipse-plugin @@ -35,7 +35,7 @@ @@ -96,93 +96,15 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd/src/org/ecli return pd; } } catch (UnsatisfiedLinkError e) { -diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project ---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -@@ -1,6 +1,6 @@ - - -- org.eclipse.core.net.linux.x86_64 -+ org.eclipse.core.net.freebsd.amd64 - - - -diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt ---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt 0000-00-00 00:00:00.000000000 +0000 -@@ -1,10 +1,10 @@ - Native Build Info: - ------------------ - --platform: linux.gtk.x86_64 -+platform: freebsd.gtk.amd64 - built by: Eric Williams, ericwill@redhat.com - build date: 24-May-2018 --OS Name: RHEL Workstation 7.5 --OS Version: Linux 3.10.0 --Compiler version: gcc (GCC) 4.8.5 --Java version: Java(TM) 8 Runtime Environment, Standard Edition (1.8.0.171) -\ No newline at end of file -+OS Name: FreeBSD -+OS Version: 12 -+Compiler version: FreeBSD clang version 6.0.1 -+Java version: Java(TM) 8 Runtime Environment, Standard Edition (1.8.0.171) -diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF ---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -3,9 +3,9 @@ - Bundle-Name: %fragmentName - Bundle-Vendor: %providerName - Bundle-Localization: fragment --Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true -+Bundle-SymbolicName: org.eclipse.core.net.freebsd.amd64;singleton:=true - Bundle-Version: 1.2.500.qualifier - Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" --Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) -+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 --Automatic-Module-Name: org.eclipse.core.net.linux.x86_64 -+Automatic-Module-Name: org.eclipse.core.net.freebsd.amd64 -diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf ---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 -@@ -1,2 +1,2 @@ - requires.0.namespace=org.eclipse.equinox.p2.iu --requires.0.name=org.eclipse.core.net.linux -+requires.0.name=org.eclipse.core.net.freebsd -diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties ---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/fragment.properties 0000-00-00 00:00:00.000000000 +0000 -@@ -11,5 +11,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --fragmentName = Proxy for Linux x86_64 -+fragmentName = Proxy for FreeBSD amd64 - providerName = Eclipse.org -diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml ---- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,7 +18,7 @@ - ../../ - - org.eclipse.core -- org.eclipse.core.net.linux.x86_64 -+ org.eclipse.core.net.freebsd.amd64 - 1.2.500-SNAPSHOT - eclipse-plugin - diff -ru eclipse.platform.team/pom.xml eclipse.platform.team/pom.xml --- eclipse.platform.team/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.team/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -73,8 +73,8 @@ - features/org.eclipse.cvs-feature +@@ -67,7 +67,7 @@ + examples/org.eclipse.team.examples.filesystem - bundles/org.eclipse.core.net.linux -- bundles/org.eclipse.core.net.linux.x86_64 + bundles/org.eclipse.core.net.freebsd -+ bundles/org.eclipse.core.net.freebsd.amd64 + bundles/org.eclipse.core.net.win32 bundles/org.eclipse.core.net.win32.x86_64 tests - diff --git a/java/eclipse/files/patch-eclipse.platform.text b/java/eclipse/files/patch-eclipse.platform.text index fd282684742d..de0dc33ff4f1 100644 --- a/java/eclipse/files/patch-eclipse.platform.text +++ b/java/eclipse/files/patch-eclipse.platform.text @@ -1,7 +1,7 @@ diff -ru eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml --- eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -1312,7 +1312,7 @@ +@@ -1354,7 +1354,7 @@ %blockSelectionModeFont.description gtk -diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -@@ -1,6 +1,6 @@ - - -- org.eclipse.equinox.security.linux.x86_64 -+ org.eclipse.equinox.security.freebsd.amd64 - - - -diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -1,12 +1,12 @@ - Manifest-Version: 1.0 - Bundle-ManifestVersion: 2 - Bundle-Name: %fragmentName --Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true -+Bundle-SymbolicName: org.eclipse.equinox.security.freebsd.amd64;singleton:=true - Bundle-Version: 1.1.500.qualifier - Bundle-Vendor: %providerName - Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)" - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 - Bundle-Localization: fragment --Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) --Automatic-Module-Name: org.eclipse.equinox.security.linux.x86_64 -+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) -+Automatic-Module-Name: org.eclipse.equinox.security.freebsd.amd64 - Eclipse-BundleShape: dir -diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 -@@ -1,2 +1,2 @@ - requires.0.namespace=org.eclipse.equinox.p2.iu --requires.0.name=org.eclipse.equinox.security.linux -\ No newline at end of file -+requires.0.name=org.eclipse.equinox.security.freebsd -diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -19,7 +19,7 @@ - ../../ - - org.eclipse.equinox -- org.eclipse.equinox.security.linux.x86_64 -+ org.eclipse.equinox.security.freebsd.amd64 - 1.1.500-SNAPSHOT - eclipse-plugin - diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml --- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -217,9 +217,9 @@ +@@ -126,9 +126,9 @@ unpack="false"/> bundles/org.eclipse.equinox.security bundles/org.eclipse.equinox.security.macosx bundles/org.eclipse.equinox.security.win32.x86_64 - bundles/org.eclipse.equinox.security.linux -- bundles/org.eclipse.equinox.security.linux.x86_64 + bundles/org.eclipse.equinox.security.freebsd -+ bundles/org.eclipse.equinox.security.freebsd.amd64 bundles/org.eclipse.equinox.bidi bundles/org.eclipse.equinox.cm bundles/org.eclipse.equinox.console diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework index c2d4aad7c8ed..1d4689898157 100644 --- a/java/eclipse/files/patch-rt.equinox.framework +++ b/java/eclipse/files/patch-rt.equinox.framework @@ -7,7 +7,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true - Bundle-Version: 1.2.300.qualifier + Bundle-Version: 1.2.500.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) -Bundle-Localization: launcher.gtk.linux.aarch64 @@ -23,7 +23,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.aarch64 + org.eclipse.equinox.launcher.gtk.freebsd.aarch64 - 1.2.300-SNAPSHOT + 1.2.500-SNAPSHOT eclipse-plugin @@ -52,7 +52,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true - Bundle-Version: 1.2.300.qualifier + Bundle-Version: 1.2.500.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) -Bundle-Localization: launcher.gtk.linux.x86_64 @@ -78,7 +78,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.x86_64 + org.eclipse.equinox.launcher.gtk.freebsd.amd64 - 1.2.300-SNAPSHOT + 1.2.500-SNAPSHOT eclipse-plugin @@ -110,7 +110,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 1.2.300.qualifier + Bundle-Version: 1.2.500.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) -Bundle-Localization: launcher.gtk.linux.ppc64le @@ -126,7 +126,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.ppc64le + org.eclipse.equinox.launcher.gtk.freebsd.powerpc64 - 1.2.300-SNAPSHOT + 1.2.500-SNAPSHOT eclipse-plugin @@ -147,7 +147,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le;singleton:=true - Bundle-Version: 1.2.300.qualifier + Bundle-Version: 1.2.500.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.5.0,1.7.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) -Bundle-Localization: launcher.gtk.linux.ppc64le @@ -163,7 +163,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.ppc64le + org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le - 1.2.300-SNAPSHOT + 1.2.500-SNAPSHOT eclipse-plugin @@ -208,7 +208,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bu diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -53,19 +53,29 @@ +@@ -57,18 +57,27 @@ fragment="true"/> -- -+ - -+ -+ - -+ ++ - - @@ -454,10 +453,10 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re + + + - - - -@@ -146,9 +154,9 @@ + + + +@@ -154,9 +162,9 @@ @@ -478,17 +477,17 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml - build-native-launchers-gtk.linux.arm -+ build-native-launchers-gtk.freebsd.armv7 ++ build-native-launchers-gtk.freebsd.arm native - gtk.linux.arm -+ gtk.freebsd.armv7 ++ gtk.freebsd.arm - bundles/org.eclipse.equinox.launcher.gtk.linux.arm -+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7 ++ bundles/org.eclipse.equinox.launcher.gtk.freebsd.arm @@ -506,8 +505,8 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml + bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64 - -@@ -89,9 +89,10 @@ + +@@ -101,9 +101,10 @@ bundles/org.eclipse.equinox.launcher.cocoa.macosx bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64 bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64 diff --git a/java/eclipse/files/patch-rt.equinox.p2 b/java/eclipse/files/patch-rt.equinox.p2 index 8cc3a6a59f7f..5283a149eb72 100644 --- a/java/eclipse/files/patch-rt.equinox.p2 +++ b/java/eclipse/files/patch-rt.equinox.p2 @@ -17,8 +17,8 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r -- -+ +- ++ @@ -26,13 +26,13 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r -- -+ +- ++ -@@ -134,7 +134,7 @@ - +@@ -133,7 +133,7 @@ + - @@ -43,14 +43,14 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r diff -ru rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -184,9 +184,9 @@ +@@ -177,9 +177,9 @@ unpack="false"/>