diff options
author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-03-09 00:13:57 +0000 |
---|---|---|
committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-03-09 00:13:57 +0000 |
commit | 56e7d8375380397a01def1441ddec0be4f4d8887 (patch) | |
tree | 838e839c76df6197f0f20e2faad4b76ffca410d0 /java | |
parent | cb371e93daf111bc30afed59865143913377c7d3 (diff) |
java/eclipse: port to powerpc64le
PR: 254149
Approved by: jonc@chen.org.nz (maintainer)
Notes
Notes:
svn path=/head/; revision=567877
Diffstat (limited to 'java')
-rw-r--r-- | java/eclipse/files/patch-eclipse-platform-parent | 16 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.pde.ui | 8 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.releng | 37 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder | 108 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.resources | 80 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.swt | 151 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.swt.binaries | 131 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.ui | 77 | ||||
-rw-r--r-- | java/eclipse/files/patch-rt.equinox.framework | 197 | ||||
-rw-r--r-- | java/eclipse/scripts/pre-build | 2 | ||||
-rw-r--r-- | java/eclipse/scripts/pre-patch | 4 |
11 files changed, 521 insertions, 290 deletions
diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent index 5a327947c269..707ccebc555b 100644 --- a/java/eclipse/files/patch-eclipse-platform-parent +++ b/java/eclipse/files/patch-eclipse-platform-parent @@ -1,6 +1,5 @@ -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 +--- eclipse-platform-parent/pom.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse-platform-parent/pom.xml 2021-03-08 19:09:17.636105000 +0100 @@ -80,9 +80,9 @@ 'eclipiserun-repo' repository, such as for computing .api-descriptions and generating API Tools reports. @@ -13,7 +12,7 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml <!-- NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file. -@@ -254,14 +254,14 @@ +@@ -254,16 +254,21 @@ </target> <environments> <environment> @@ -31,8 +30,15 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml + <arch>powerpc64</arch> </environment> <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>powerpc64le</arch> ++ </environment> ++ <environment> <os>win32</os> -@@ -626,7 +626,7 @@ + <ws>win32</ws> + <arch>x86_64</arch> +@@ -626,7 +631,7 @@ For maintenance streams should always be "M-builds". Ideally, this value would be provided by the environment, see bug 489789. --> diff --git a/java/eclipse/files/patch-eclipse.pde.ui b/java/eclipse/files/patch-eclipse.pde.ui index 47fcce88f175..889c3a6ffb59 100644 --- a/java/eclipse/files/patch-eclipse.pde.ui +++ b/java/eclipse/files/patch-eclipse.pde.ui @@ -1,13 +1,13 @@ -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 @@ +--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product.orig 2020-05-14 19:49:48.000000000 +0200 ++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 2021-03-08 19:10:46.275610000 +0100 +@@ -80,8 +80,9 @@ <plugin id="org.eclipse.osgi.util"/> <plugin id="org.eclipse.swt"/> <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/> - <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/> - <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/> + <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64" fragment="true"/> ++ <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64le" fragment="true"/> + <plugin id="org.eclipse.swt.gtk.freebsd.amd64" fragment="true"/> <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/> <plugin id="org.eclipse.urischeme"/> diff --git a/java/eclipse/files/patch-eclipse.platform.releng b/java/eclipse/files/patch-eclipse.platform.releng index 90edfe676e80..017656a17a42 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng +++ b/java/eclipse/files/patch-eclipse.platform.releng @@ -1,6 +1,5 @@ -diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml ---- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.orig 2020-05-28 13:29:36.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2021-03-08 19:12:31.612581000 +0100 @@ -96,9 +96,9 @@ unpack="false"/> @@ -40,7 +39,24 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x download-size="0" install-size="0" version="0.0.0" -@@ -465,9 +465,9 @@ +@@ -411,6 +411,16 @@ + unpack="false"/> + + <plugin ++ id="org.eclipse.core.filesystem.freebsd.powerpc64le" ++ os="freebsd" ++ arch="powerpc64le" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ ++ <plugin + id="org.eclipse.core.variables" + download-size="0" + install-size="0" +@@ -465,9 +475,9 @@ unpack="false"/> <plugin @@ -53,10 +69,9 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x download-size="0" install-size="0" version="0.0.0" -diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml ---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -55,10 +55,10 @@ +--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2020-05-28 13:29:36.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2021-03-08 19:12:49.804474000 +0100 +@@ -55,10 +55,11 @@ </plugins> <excludes> <plugin id="org.eclipse.platform.doc.user"/> @@ -66,12 +81,12 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml e <plugin id="org.eclipse.core.filesystem.win32.x86_64"/> - <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/> + <plugin id="org.eclipse.core.filesystem.freebsd.powerpc64"/> ++ <plugin id="org.eclipse.core.filesystem.freebsd.powerpc64le"/> <plugin id="org.eclipse.core.resources.win32.x86_64"/> </excludes> </configuration> -diff -ru eclipse.platform.releng/pom.xml eclipse.platform.releng/pom.xml ---- eclipse.platform.releng/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng/pom.xml.orig 2020-05-28 13:29:36.000000000 +0200 ++++ eclipse.platform.releng/pom.xml 2021-03-08 19:05:06.938707000 +0100 @@ -66,7 +66,9 @@ <module>features/org.eclipse.releng.tools</module> <module>features/org.eclipse.sdk</module> diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder index 88add425c2be..cec8e46a6b7b 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder +++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder @@ -1,7 +1,6 @@ -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 @@ +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 2021-03-08 19:15:45.372727000 +0100 +@@ -8,12 +8,16 @@ fileName="eclipse-SDK-${BUILD_ID}-win32-x86_64.zip"></platform> <platform id="SLG264" @@ -10,15 +9,19 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/tes + name="FreeBSD (64 bit version)" + fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform> <platform ++ id="SLG2PPC64BE" ++ name="FreeBSD (64 bit version for Power PC)" ++ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform> ++ <platform id="SLG2PPC64LE" - name="Linux (64 bit version for Power PC)" - fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform> -+ name="FreeBSD (64 bit version for Power PC)" -+ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform> ++ name="FreeBSD (64 bit little-endian version for Power PC)" ++ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64le.tar.gz"></platform> <platform id="SMCC64" name="Mac OSX (64 bit version)" -@@ -70,12 +70,12 @@ +@@ -70,12 +74,16 @@ fileName="eclipse-platform-${BUILD_ID}-win32-x86_64.zip"></platform> <platform id="PLG264" @@ -27,15 +30,19 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/tes + name="FreeBSD (64 bit version)" + fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform> <platform ++ id="PLG2PPC64BE" ++ name="FreeBSD (64 bit version for Power PC)" ++ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform> ++ <platform id="PLG2PPC64LE" - name="Linux (64 bit version for Power PC)" - fileName="eclipse-platform-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform> -+ name="FreeBSD (64 bit version for Power PC)" -+ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform> ++ name="FreeBSD (64 bit little-endian version for Power PC)" ++ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64le.tar.gz"></platform> <platform id="PMCC64" name="Mac OSX (64 bit version)" -@@ -150,12 +150,12 @@ +@@ -150,12 +158,16 @@ fileName="swt-${BUILD_ID}-win32-win32-x86_64.zip"></platform> <platform id="SWTLG64" @@ -44,17 +51,20 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/tes + name="FreeBSD (64 bit version)" + fileName="swt-${BUILD_ID}-gtk-freebsd-amd64.zip"></platform> <platform ++ id="SWTLG2PPC64BE" ++ name="FreeBSD (64 bit version for Power PC)" ++ fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64.zip"></platform> ++ <platform id="SWTLG2PPC64LE" - name="Linux (64 bit version for Power PC)" - fileName="swt-${BUILD_ID}-gtk-linux-ppc64le.zip"></platform> -+ name="FreeBSD (64 bit version for Power PC)" -+ fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64.zip"></platform> ++ name="FreeBSD (64 bit little-endian version for Power PC)" ++ fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64le.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 ---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 2021-03-08 19:05:06.948454000 +0100 @@ -138,9 +138,9 @@ <resolver>p2</resolver> <environments> @@ -67,10 +77,9 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml </environment> <environment> <os>win32</os> -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 @@ +--- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml 2021-03-08 19:16:10.708519000 +0100 +@@ -14,8 +14,9 @@ <target name="equinoxlaunchers"> <property name="archiveRoot" value="launchers" /> <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" /> @@ -78,12 +87,12 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equino - <buildRepos os="linux" ws="gtk" arch="ppc64le" archiveName="${archiveRoot}-linux.gtk.ppc64le.${buildId}.tar.gz" /> + <buildRepos os="freebsd" ws="gtk" arch="amd64" archiveName="${archiveRoot}-freebsd.gtk.amd64.${buildId}.tar.gz" /> + <buildRepos os="freebsd" ws="gtk" arch="powerpc64" archiveName="${archiveRoot}-freebsd.gtk.powerpc64.${buildId}.tar.gz" /> ++ <buildRepos os="freebsd" ws="gtk" arch="powerpc64le" archiveName="${archiveRoot}-freebsd.gtk.powerpc64le.${buildId}.tar.gz" /> <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" /> </target> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product ---- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product 2021-03-08 19:05:06.949169000 +0100 @@ -18,7 +18,7 @@ <windowImages/> @@ -93,9 +102,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/ <macosx icon="rt.icns"/> <win useIco="false"> <bmp/> -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 +--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml 2021-03-08 19:05:06.949519000 +0100 @@ -43,9 +43,9 @@ <resolver>p2</resolver> <environments> @@ -117,9 +125,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/ <macosx>tar.gz</macosx> </formats> </configuration> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product ---- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2021-03-08 19:05:06.949844000 +0100 @@ -18,7 +18,7 @@ <splash location="org.eclipse.platform" /> @@ -129,9 +136,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product e <macosx icon="icons/Eclipse.icns"/> <win useIco="false"> <bmp/> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml ---- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2021-03-08 19:05:06.950147000 +0100 @@ -79,7 +79,7 @@ <configuration> <formats> @@ -141,9 +147,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml eclipse.pl <macosx>tar.gz</macosx> </formats> </configuration> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product ---- eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product 2021-03-08 19:05:06.950497000 +0100 @@ -18,7 +18,7 @@ <splash location="org.eclipse.platform" /> @@ -153,9 +158,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p <macosx icon="icons/Eclipse.icns"/> <win useIco="false"> <bmp/> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.releng.tychoeclipsebuilder/pom.xml ---- eclipse.platform.releng.tychoeclipsebuilder/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2021-03-08 19:05:06.950798000 +0100 @@ -36,7 +36,9 @@ <module>platform</module> <module>platform.sdk</module> @@ -166,9 +170,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.re + --> </modules> </project> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product ---- eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product 2021-03-08 19:05:06.951141000 +0100 @@ -16,7 +16,7 @@ </launcherArgs> @@ -178,10 +181,9 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product eclipse.pla <macosx icon="icons/Eclipse.icns"/> <win useIco="false"> <bmp/> -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 @@ +--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 2021-03-08 19:16:52.873764000 +0100 +@@ -29,11 +29,14 @@ #root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe #root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe @@ -192,14 +194,16 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties -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.powerpc64le=rootfiles/freebsd.gtk.powerpc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64le ++root.freebsd.gtk.powerpc64le.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.permissions.755=eclipse bin.includes = feature.properties -diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product ---- eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product 2021-03-08 19:05:06.951767000 +0100 @@ -18,7 +18,7 @@ <windowImages/> @@ -209,9 +213,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product ecl <macosx icon="icons/Eclipse.icns"/> <win useIco="false"> <bmp/> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml ---- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 2021-03-08 19:05:06.952089000 +0100 @@ -77,7 +77,7 @@ <configuration> <formats> @@ -221,9 +224,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml eclipse.platfor <macosx>tar.gz</macosx> </formats> </configuration> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product ---- eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product.orig 2020-06-04 12:00:14.000000000 +0200 ++++ eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product 2021-03-08 19:05:06.952429000 +0100 @@ -18,7 +18,7 @@ <splash location="org.eclipse.platform" /> diff --git a/java/eclipse/files/patch-eclipse.platform.resources b/java/eclipse/files/patch-eclipse.platform.resources index c771fc9ae4a1..37330bb44e0a 100644 --- a/java/eclipse/files/patch-eclipse.platform.resources +++ b/java/eclipse/files/patch-eclipse.platform.resources @@ -1,6 +1,5 @@ -diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile ---- eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2021-03-08 20:18:47.266872000 +0100 @@ -20,7 +20,7 @@ LIB_NAME_FULL = libunixfile_1_0_0.so @@ -29,9 +28,8 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/ -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.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 +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project 2021-03-08 20:18:47.267280000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> @@ -40,9 +38,8 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. <comment></comment> <projects> </projects> -diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF ---- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.267678000 +0100 @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 @@ -55,9 +52,8 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) -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 +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml 2021-03-08 20:18:47.268150000 +0100 @@ -18,7 +18,7 @@ <relativePath>../../</relativePath> </parent> @@ -103,9 +99,8 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. <include name="libunixfile_*.so"/> </fileset> </copy> -diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF ---- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.268509000 +0100 @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 @@ -118,9 +113,8 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=ppc64le)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=powerpc64)) -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 +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml 2021-03-08 20:18:47.268870000 +0100 @@ -18,7 +18,7 @@ <relativePath>../../</relativePath> </parent> @@ -142,23 +136,59 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. </environment> </environments> </configuration> -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 @@ +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF.orig 2021-03-08 20:20:31.138482000 +0100 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/META-INF/MANIFEST.MF 2021-03-08 20:20:57.684056000 +0100 +@@ -1,9 +1,9 @@ + Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %fragmentName +-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.ppc64le;singleton:=true ++Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.powerpc64le;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=ppc64le)) ++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=powerpc64le)) +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml.orig 2021-03-08 20:27:07.595490000 +0100 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64le/pom.xml 2021-03-08 20:27:29.452487000 +0100 +@@ -18,7 +18,7 @@ + <relativePath>../../</relativePath> + </parent> + <groupId>org.eclipse.core</groupId> +- <artifactId>org.eclipse.core.filesystem.linux.ppc64le</artifactId> ++ <artifactId>org.eclipse.core.filesystem.freebsd.powerpc64le</artifactId> + <version>1.4.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +@@ -37,9 +37,9 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>ppc64le</arch> ++ <arch>powerpc64le</arch> + </environment> + </environments> + </configuration> +--- eclipse.platform.resources/pom.xml.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/pom.xml 2021-03-08 20:22:22.387766000 +0100 +@@ -52,8 +52,9 @@ <modules> <module>bundles/org.eclipse.core.filesystem</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.powerpc64</module> ++ <module>bundles/org.eclipse.core.filesystem.freebsd.powerpc64le</module> + <module>bundles/org.eclipse.core.filesystem.freebsd.amd64</module> <module>bundles/org.eclipse.core.filesystem.macosx</module> <module>bundles/org.eclipse.core.filesystem.win32.x86_64</module> -diff -ru eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml ---- eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml.orig 2020-05-14 17:23:06.000000000 +0200 ++++ eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml 2021-03-08 20:18:47.269488000 +0100 @@ -28,9 +28,9 @@ unpack="false"/--> diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt index 4391bcaa9b11..56be9f4af7f5 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt +++ b/java/eclipse/files/patch-eclipse.platform.swt @@ -1,6 +1,5 @@ -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk ---- eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk 2021-03-08 20:18:47.290005000 +0100 @@ -10,7 +10,7 @@ <classpathentry kind="src" path="Eclipse SWT/common_j2se"/> <classpathentry kind="src" path="Eclipse SWT PI/gtk"> @@ -10,9 +9,8 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk eclipse.pla </attributes> </classpathentry> <classpathentry kind="src" path="Eclipse SWT PI/cairo"/> -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 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 2021-03-08 20:18:47.291226000 +0100 @@ -10,7 +10,7 @@ * * Contributors: @@ -22,9 +20,8 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/ecli *******************************************************************************/ package org.eclipse.swt.widgets; -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 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 2021-03-08 20:18:47.291879000 +0100 @@ -69,12 +69,12 @@ static String arch() { String osArch = System.getProperty("os.arch"); //$NON-NLS-1$ @@ -39,9 +36,8 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/ if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$ -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh ---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2021-03-08 20:31:19.761093000 +0100 @@ -72,7 +72,7 @@ cd `dirname $0` @@ -74,7 +70,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library fi case $MODEL in "x86_64") -@@ -111,6 +104,11 @@ +@@ -111,6 +104,16 @@ SWT_ARCH=x86 AWT_ARCH=i386 ;; @@ -83,10 +79,15 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library + AWT_ARCH=ppc64 + MODEL=`uname -p` + ;; ++ "powerpc64le") ++ SWT_ARCH=ppc64le ++ AWT_ARCH=ppc64le ++ MODEL=`uname -p` ++ ;; *) SWT_ARCH=$MODEL AWT_ARCH=$MODEL -@@ -118,6 +116,13 @@ +@@ -118,6 +121,20 @@ esac case $SWT_OS.$SWT_ARCH in @@ -97,19 +98,26 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library + export JAVA_HOME + fi + ;; ++ "freebsd.ppc64le") ++ if [ "${JAVA_HOME}" = "" ]; then ++ DYNAMIC_JAVA_HOME=`readlink -f /usr/local/bin/java | sed "s:jre/::" | sed "s:bin/java::"` ++ JAVA_HOME = $DYNAMIC_JAVA_HOME ++ export JAVA_HOME ++ fi ++ ;; "linux.x86") if [ "${CC}" = "" ]; then export CC=gcc -@@ -194,7 +199,7 @@ +@@ -194,7 +211,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} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then XLIB64=-L/usr/X11R6/lib64 -@@ -205,6 +210,11 @@ +@@ -205,6 +222,11 @@ XLIB64="${XLIB64} -L/usr/lib64" SWT_LFLAGS=-m64 export SWT_LFLAGS @@ -121,9 +129,8 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library fi export SWT_PTR_CFLAGS 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 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2021-03-08 20:18:47.292979000 +0100 @@ -103,16 +103,18 @@ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o @@ -157,9 +164,8 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library @# 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 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2021-03-08 20:18:47.294228000 +0100 @@ -60,8 +60,8 @@ /* Initialize the OS flags and locale constants */ @@ -171,9 +177,8 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl if (osName.startsWith("Windows")) isWin32 = true; IsLinux = isLinux; IsWin32 = isWin32; -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 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 2021-03-08 20:18:47.295739000 +0100 @@ -120,7 +120,7 @@ * 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 @@ -183,10 +188,9 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org /** Workaround for bug 522733 */ static boolean bug522733FirstInstanceCreated = false; -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 @@ +--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2021-03-08 20:32:15.547465000 +0100 +@@ -16,11 +16,16 @@ 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,10 +206,14 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.pl 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))) -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 @@ ++ ++requires.6.namespace = org.eclipse.equinox.p2.iu ++requires.6.name = org.eclipse.swt.gtk.freebsd.powerpc64le ++requires.6.range = [$version$,$version$] ++requires.6.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64le)(!(org.eclipse.swt.buildtime=true))) +--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 2021-03-08 20:36:54.906169000 +0100 +@@ -63,13 +63,17 @@ </antcall> <antcall target="check_fragment_libraries"> <param name="library_count" value="8"/> @@ -215,26 +223,32 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platf <antcall target="check_fragment_libraries"> <param name="library_count" value="8"/> - <param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/> -+ <param name="fragment" value="org.eclipse.swt.gtk.freebsd.amd64"/> ++ <param name="fragment" value="org.eclipse.swt.gtk.freebsd.powerpc64le"/> </antcall> <antcall target="check_fragment_libraries"> ++ <param name="library_count" value="8"/> ++ <param name="fragment" value="org.eclipse.swt.gtk.freebsd.amd64"/> ++ </antcall> ++ <antcall target="check_fragment_libraries"> <param name="library_count" value="4"/> -@@ -80,12 +80,12 @@ + <param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/> + </antcall> +@@ -80,12 +84,12 @@ <property name="checkdir" value="~/build/check_libraries"/> <property name="library_count" value="23"/> <property name="fragment" value=""/> - <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> -+ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> ++ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.gtk.freebsd.powerpc64le/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> <filename regex="[0-9][0-9][0-9][0-9]."/> <filename regex="${swt_version}."/> <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.*/**"> ++ <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.powerpc64le**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> <filename regex="[0-9][0-9][0-9][0-9]."/> <filename regex="${swt_version}." negate="true"/> <exclude name="**/.git/**"/> -@@ -115,13 +115,13 @@ +@@ -115,14 +119,22 @@ trust="true" outputproperty="m_linux_x86_64_output" command="hostname"/> @@ -248,9 +262,18 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platf - outputproperty="m_linux_ppc64le_output" + outputproperty="m_linux_powerpc64_output" command="hostname"/> ++ <sshexec host="${m_linux_powerpc64le}" ++ port="2256" ++ username="swtbuild" ++ keyfile="${keyfile}" ++ failonerror="false" ++ trust="true" ++ outputproperty="m_linux_powerpc64le_output" ++ command="hostname"/> <sshexec host="${m_mac}" username="swtbuild" -@@ -139,10 +139,10 @@ + keyfile="${keyfile}" +@@ -139,10 +151,16 @@ <matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/> </and> </condition> @@ -261,25 +284,29 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platf - <matches pattern="x${m_linux_ppc64le_output}*" string="x${m_linux_ppc64le}"/> + <length string="${m_linux_powerpc64_output}" when="greater" length="0"/> + <matches pattern="x${m_linux_powerpc64_output}*" string="x${m_linux_powerpc64}"/> ++ </and> ++ </condition> ++ <condition property="m_linux_powerpc64le_test" value="${success_msg}" else="${fail_msg}"> ++ <and> ++ <length string="${m_linux_powerpc64le_output}" when="greater" length="0"/> ++ <matches pattern="x${m_linux_powerpc64le_output}*" string="x${m_linux_powerpc64le}"/> </and> </condition> <condition property="m_mac_test" value="${success_msg}" else="${fail_msg}"> -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 +--- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 2021-03-08 20:37:08.379254000 +0100 @@ -103,7 +103,7 @@ xsi:type="predicates:NotPredicate"> <operand xsi:type="predicates:NamePredicate" - pattern=".*(cocoa|gtk|win32)(\.(macosx|aix|hpux|linux|solaris|win32)(\.(x86_64|ppc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/> -+ pattern=".*(cocoa|gtk|win32)(\.(freebsd|macosx|aix|hpux|linux|solaris|win32)(\.(amd64|x86_64|powerpc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/> ++ pattern=".*(cocoa|gtk|win32)(\.(freebsd|macosx|aix|hpux|linux|solaris|win32)(\.(amd64|x86_64|powerpc64|powerpc64le|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/> </operand> <operand xsi:type="predicates:NamePredicate" -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 @@ +--- eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf 2021-03-08 20:37:33.844415000 +0100 +@@ -10,11 +10,16 @@ requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) requires.3.namespace = org.eclipse.equinox.p2.iu @@ -295,9 +322,13 @@ diff -ru eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/M 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)) -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 ++ ++requires.5.namespace = org.eclipse.equinox.p2.iu ++requires.5.name = org.eclipse.swt.gtk.freebsd.powerpc64le ++requires.5.range = 0.0.0 ++requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64le)) +--- eclipse.platform.swt/pom.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/pom.xml 2021-03-08 20:18:47.297968000 +0100 @@ -85,11 +85,12 @@ <activation> <os> @@ -322,9 +353,8 @@ diff -ru eclipse.platform.swt/pom.xml eclipse.platform.swt/pom.xml <module>features/org.eclipse.swt.tools.feature</module> </modules> </project> -diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml ---- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 2021-03-08 20:38:27.083939000 +0100 @@ -20,10 +20,10 @@ </license> @@ -339,7 +369,7 @@ diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feat download-size="0" install-size="0" version="0.0.0" -@@ -31,10 +31,10 @@ +@@ -31,10 +31,21 @@ unpack="false"/> <plugin @@ -350,6 +380,17 @@ diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feat ws="gtk" - arch="ppc64le" + arch="powerpc64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ ++ <plugin ++ id="org.eclipse.swt.gtk.freebsd.powerpc64le" ++ os="freebsd" ++ ws="gtk" ++ arch="powerpc64le" download-size="0" install-size="0" version="0.0.0" diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries index 84ffbaee5e90..c5de7915ed08 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt.binaries +++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries @@ -1,6 +1,5 @@ -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 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.307541000 +0100 @@ -2,7 +2,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Bundle-Name: %fragmentName @@ -22,9 +21,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch SWT-Arch: aarch64 -Automatic-Module-Name: org.eclipse.swt.gtk.linux.aarch64 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.aarch64 -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml 2021-03-08 20:18:47.307863000 +0100 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.swt.gtk.linux.aarch64" default="build.jars" basedir="."> @@ -36,9 +34,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch <property name="swt.arch" value="aarch64" /> <property name="targets" value="install"/> -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml 2021-03-08 20:18:47.308240000 +0100 @@ -20,12 +20,12 @@ <relativePath>../binaries-parent/</relativePath> </parent> @@ -63,9 +60,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch </property> </activation> <build> -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project 2021-03-08 20:18:47.308571000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> @@ -74,9 +70,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 <comment></comment> <projects> </projects> -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.308897000 +0100 @@ -2,7 +2,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Bundle-Name: %fragmentName @@ -99,9 +94,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 +SWT-OS: freebsd +SWT-Arch: amd64 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.amd64 -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml 2021-03-08 20:18:47.309197000 +0100 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir="."> @@ -115,9 +109,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 <property name="targets" value="install"/> <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh 2021-03-08 20:18:47.309511000 +0100 @@ -36,10 +36,10 @@ if [ "${DEV_ECLIPSE}" != "" ]; then @@ -132,9 +125,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 else echo "Note:" echo " Set DEV_ECLIPSE to your development eclipse folder to have the *.jar files copied into it automatically." -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml 2021-03-08 20:18:47.309862000 +0100 @@ -20,14 +20,14 @@ <relativePath>../binaries-parent/</relativePath> </parent> @@ -162,9 +154,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 </property> </activation> <build> -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.310191000 +0100 @@ -2,7 +2,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Bundle-Name: %fragmentName @@ -187,9 +178,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power +SWT-OS: freebsd +SWT-Arch: powerpc64 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.powerpc64 -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml 2021-03-08 20:18:47.310494000 +0100 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.swt.gtk.linux.ppc64le" default="build.jars" basedir="."> @@ -203,9 +193,8 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power <property name="targets" value="install"/> <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> -diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml ---- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml 2021-03-08 20:18:47.310862000 +0100 @@ -20,14 +20,14 @@ <relativePath>../binaries-parent/</relativePath> </parent> @@ -233,16 +222,84 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power </property> </activation> <build> -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 @@ +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF.orig 2021-03-08 20:45:12.925805000 +0100 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF 2021-03-08 20:45:58.878270000 +0100 +@@ -2,7 +2,7 @@ + Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" + Bundle-Name: %fragmentName + Bundle-Vendor: %providerName +-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true ++Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64le;singleton:=true + Bundle-Version: 3.114.100.qualifier + Bundle-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, + 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)) + SWT-WS: gtk +-SWT-OS: linux +-SWT-Arch: ppc64le +-Automatic-Module-Name: org.eclipse.swt.gtk.linux.ppc64le ++SWT-OS: freebsd ++SWT-Arch: powerpc64le ++Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.powerpc64le +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml.orig 2021-03-08 20:46:24.538852000 +0100 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/build.xml 2021-03-08 20:46:47.697856000 +0100 +@@ -1,9 +1,9 @@ + <?xml version="1.0" encoding="UTF-8"?> +-<project name="org.eclipse.swt.gtk.linux.ppc64le" default="build.jars" basedir="."> ++<project name="org.eclipse.swt.gtk.freebsd.powerpc64le" default="build.jars" basedir="."> + + <property name="swt.ws" value="gtk" /> +- <property name="swt.os" value="linux" /> +- <property name="swt.arch" value="ppc64le" /> ++ <property name="swt.os" value="freebsd" /> ++ <property name="swt.arch" value="powerpc64le" /> + <property name="targets" value="install"/> + + <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/pom.xml.orig 2021-03-08 20:47:06.200163000 +0100 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64le/pom.xml 2021-03-08 20:47:32.469033000 +0100 +@@ -20,14 +20,14 @@ + <relativePath>../binaries-parent/</relativePath> + </parent> + <groupId>org.eclipse.swt</groupId> +- <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId> ++ <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64le</artifactId> + <version>3.114.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <properties> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>ppc64le</arch> ++ <arch>powerpc64le</arch> + <buildid>${buildId}</buildid> + </properties> + +@@ -61,7 +61,7 @@ + <property> + <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( --> + <name>native</name> +- <value>gtk.linux.ppc64le</value> ++ <value>gtk.freebsd.powerpc64le</value> + </property> + </activation> + <build> +--- eclipse.platform.swt.binaries/pom.xml.orig 2020-06-04 11:51:28.000000000 +0200 ++++ eclipse.platform.swt.binaries/pom.xml 2021-03-08 20:47:55.910881000 +0100 +@@ -54,8 +54,9 @@ <modules> <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</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.powerpc64</module> ++ <module>bundles/org.eclipse.swt.gtk.freebsd.powerpc64le</module> + <module>bundles/org.eclipse.swt.gtk.freebsd.amd64</module> <module>bundles/org.eclipse.swt.win32.win32.x86_64</module> </modules> diff --git a/java/eclipse/files/patch-eclipse.platform.ui b/java/eclipse/files/patch-eclipse.platform.ui index c5ca5579e242..dc9b30dfed91 100644 --- a/java/eclipse/files/patch-eclipse.platform.ui +++ b/java/eclipse/files/patch-eclipse.platform.ui @@ -1,6 +1,5 @@ -diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml ---- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml.orig 2020-06-03 13:17:27.000000000 +0200 ++++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 2021-03-08 20:18:47.351392000 +0100 @@ -33,9 +33,9 @@ <resolver>p2</resolver> <environments> @@ -13,9 +12,8 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.p </environment> </environments> </configuration> -diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml ---- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml.orig 2020-06-03 13:17:27.000000000 +0200 ++++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml 2021-03-08 20:18:47.351814000 +0100 @@ -94,7 +94,7 @@ <browser id="org.eclipse.ui.browser.firefox" @@ -58,9 +56,8 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml eclipse.p executable="epiphany"> <location> usr/bin/epiphany -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 +--- eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java.orig 2020-06-03 13:17:27.000000000 +0200 ++++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java 2021-03-08 20:18:47.352410000 +0100 @@ -210,7 +210,8 @@ if (currentTitleControl.getVisible()) { int tw = width - HMARGIN * 2 - SPACING * 2; @@ -78,9 +75,8 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/int -} \ No newline at end of file +} -diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml ---- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml.orig 2020-06-03 13:17:27.000000000 +0200 ++++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 2021-03-08 20:18:47.352793000 +0100 @@ -12,7 +12,7 @@ basestylesheeturi="css/e4-dark_linux.css" id="org.eclipse.e4.ui.css.theme.e4_dark" @@ -99,9 +95,8 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml eclipse.pl </theme> <theme basestylesheeturi="css/e4_default_mac.css" -diff -ru eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java ---- eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java 0000-00-00 00:00:00.000000000 +0000 +--- eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java.orig 2020-06-03 13:17:27.000000000 +0200 ++++ eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java 2021-03-08 20:18:47.353114000 +0100 @@ -33,6 +33,8 @@ * @return an instance of IOperatingSystemRegistration */ @@ -111,10 +106,9 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urisc if (Platform.OS_MACOSX.equals(Platform.getOS())) { return new RegistrationMacOsX(); } else if (Platform.OS_LINUX.equals(Platform.getOS())) { -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 @@ +--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2020-06-03 13:17:27.000000000 +0200 ++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2021-03-08 20:55:41.125354000 +0100 +@@ -403,26 +403,36 @@ fragment="true"/> <plugin @@ -133,15 +127,31 @@ diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.pla <plugin - id="org.eclipse.equinox.launcher.gtk.linux.x86_64" - os="linux" -+ id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" ++ id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le" + os="freebsd" ws="gtk" - arch="x86_64" -+ arch="amd64" ++ arch="powerpc64le" download-size="0" install-size="0" version="0.0.0" -@@ -451,10 +451,10 @@ + fragment="true"/> + + <plugin ++ id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" ++ os="freebsd" ++ ws="gtk" ++ arch="amd64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true"/> ++ ++ <plugin + id="org.eclipse.equinox.launcher.win32.win32.x86_64" + os="win32" + ws="win32" +@@ -451,10 +461,10 @@ unpack="false"/> <plugin @@ -155,30 +165,41 @@ diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.pla download-size="0" install-size="0" version="0.0.0" -@@ -462,10 +462,10 @@ +@@ -462,10 +472,21 @@ unpack="false"/> <plugin - id="org.eclipse.swt.gtk.linux.x86_64" - os="linux" -+ id="org.eclipse.swt.gtk.freebsd.amd64" ++ id="org.eclipse.swt.gtk.freebsd.powerpc64le" + os="freebsd" ws="gtk" - arch="x86_64" ++ arch="powerpc64le" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ ++ <plugin ++ id="org.eclipse.swt.gtk.freebsd.amd64" ++ os="freebsd" ++ ws="gtk" + 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 @@ +--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2020-06-03 13:17:27.000000000 +0200 ++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2021-03-08 20:56:25.872460000 +0100 +@@ -39,8 +39,9 @@ <plugin id="javax.xml"/> <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.x86_64"/> + <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64"/> ++ <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le"/> + <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"/> <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/> </excludes> diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework index bf92c27a2f01..82aa651e08f7 100644 --- a/java/eclipse/files/patch-rt.equinox.framework +++ b/java/eclipse/files/patch-rt.equinox.framework @@ -1,6 +1,5 @@ -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.376563000 +0100 @@ -2,9 +2,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName @@ -14,9 +13,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64)) +Bundle-Localization: launcher.gtk.freebsd.aarch64 Eclipse-BundleShape: dir -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml 2021-03-08 20:18:47.376862000 +0100 @@ -18,12 +18,12 @@ <relativePath>../../launcher-binary-parent</relativePath> </parent> @@ -32,9 +30,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a <ws>gtk</ws> <arch>aarch64</arch> <skipAPIAnalysis>true</skipAPIAnalysis> -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 2021-03-08 20:18:47.377168000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> @@ -43,9 +40,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a <comment></comment> <projects> </projects> -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.377471000 +0100 @@ -2,9 +2,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName @@ -59,9 +55,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64)) +Bundle-Localization: launcher.gtk.freebsd.amd64 Eclipse-BundleShape: dir -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties 2021-03-08 20:18:47.377766000 +0100 @@ -11,5 +11,5 @@ # Contributors: # IBM Corporation - initial API and implementation @@ -69,9 +64,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a -pluginName = Equinox Launcher Linux X86_64 Fragment +pluginName = Equinox Launcher FreeBSD/amd64 Fragment providerName = Eclipse.org - Equinox -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 2021-03-08 20:18:47.378067000 +0100 @@ -18,14 +18,14 @@ <relativePath>../../launcher-binary-parent</relativePath> </parent> @@ -90,9 +84,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a <skipAPIAnalysis>true</skipAPIAnalysis> </properties> </project> -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 2021-03-08 20:18:47.378338000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> @@ -101,9 +94,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p <comment></comment> <projects> </projects> -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 2021-03-08 20:18:47.378618000 +0100 @@ -2,9 +2,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName @@ -117,9 +109,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64)) +Bundle-Localization: launcher.gtk.freebsd.powerpc64 Eclipse-BundleShape: dir -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 2021-03-08 20:18:47.378921000 +0100 @@ -18,14 +18,14 @@ <relativePath>../../launcher-binary-parent</relativePath> </parent> @@ -138,10 +129,9 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p <skipAPIAnalysis>true</skipAPIAnalysis> </properties> </project> -diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties ---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 -@@ -24,11 +24,11 @@ +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2021-03-08 21:03:17.665874000 +0100 +@@ -24,11 +24,14 @@ root.win32.win32.x86_64=bin/win32/win32/x86_64 root.win32.win32.x86_64.permissions.755=launcher.exe @@ -150,6 +140,9 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bu +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root +root.freebsd.gtk.powerpc64.permissions.755=launcher ++root.freebsd.gtk.powerpc64le=bin/gtk/freebsd/powerpc64le,gtk_root ++root.freebsd.gtk.powerpc64le.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 @@ -157,10 +150,9 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bu -root.linux.gtk.x86_64.permissions.755=libcairo-swt.so +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so -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 @@ +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 2021-03-08 21:03:42.443880000 +0100 +@@ -33,20 +33,30 @@ fragment="true"/> <plugin @@ -179,17 +171,26 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/fe <plugin - id="org.eclipse.equinox.launcher.gtk.linux.x86_64" - os="linux" -+ id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" ++ id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le" + os="freebsd" ws="gtk" - arch="x86_64" ++ arch="powerpc64le" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true"/> ++ ++ <plugin ++ id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" ++ os="freebsd" ++ ws="gtk" + arch="amd64" download-size="0" install-size="0" version="0.0.0" -diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh ---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2021-03-08 20:18:47.379966000 +0100 @@ -112,8 +112,13 @@ ;; esac @@ -230,9 +231,8 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/li esac fi else -diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak ---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 2021-03-08 20:18:47.380438000 +0100 @@ -81,10 +81,11 @@ -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \ @@ -272,24 +272,23 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/li install: all cp $(EXEC) $(OUTPUT_DIR) -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 @@ +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2021-03-08 21:04:15.182274000 +0100 +@@ -123,8 +123,9 @@ <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true"> <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/x86_64/**/*"/> + <include name="gtk/freebsd/powerpc64/**/*"/> ++ <include name="gtk/freebsd/powerpc64le/**/*"/> + <include name="gtk/freebsd/amd64/**/*"/> <include name="win32/win32/x86_64/**/*"/> </fileset> </copy> -diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties ---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties 0000-00-00 00:00:00.000000000 +0000 -@@ -20,12 +20,12 @@ +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties 2021-03-08 21:04:39.288086000 +0100 +@@ -20,12 +20,15 @@ root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe root.win32.win32.x86_64.permissions.755=launcher.exe @@ -298,6 +297,9 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root +root.freebsd.gtk.powerpc64.permissions.755=launcher ++root.freebsd.gtk.powerpc64le=bin/gtk/freebsd/powerpc64le,gtk_root ++root.freebsd.gtk.powerpc64le.permissions.755=launcher ++ root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName} @@ -306,10 +308,9 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so -diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml ---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -76,29 +76,29 @@ +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 2021-03-08 21:05:37.421487000 +0100 +@@ -76,30 +76,38 @@ <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" /> <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> </target> @@ -330,44 +331,53 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re - <mkdir dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/gtk/linux/aarch64" includes="**" /> -+ <target name="rootFilesfreebsd_gtk_aarch64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/bin/gtk/freebsd/aarch64" includes="**" /> ++ <target name="rootFilesfreebsd_gtk_powerpc64le"> ++ <mkdir dir="${feature.base}/freebsd.gtk.powerpc64le/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.powerpc64le/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/bin/gtk/freebsd/powerpc64le" includes="**" /> <fileset dir="${basedir}/gtk_root" includes="**" /> </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" includes="launcher" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" includes="launcher" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64le/${collectingFolder}" includes="launcher" /> </target> - <target name="rootFileslinux_gtk_x86_64"> - <mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/gtk/linux/x86_64" includes="**" /> ++ <target name="rootFilesfreebsd_gtk_aarch64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/bin/gtk/freebsd/aarch64" includes="**" /> + <fileset dir="${basedir}/gtk_root" includes="**" /> + </copy> +- <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="launcher" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" includes="launcher" /> + </target> + <target name="rootFilesfreebsd_gtk_amd64"> + <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> + <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/bin/gtk/freebsd/amd64" includes="**" /> - <fileset dir="${basedir}/gtk_root" includes="**" /> - </copy> -- <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="launcher" /> ++ <fileset dir="${basedir}/gtk_root" includes="**" /> ++ </copy> + <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="launcher" /> - </target> ++ </target> <target name="rootFileslinux_gtk_ia64"> <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> -@@ -138,8 +138,8 @@ + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -138,8 +146,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_x86_64"/> + <antcall target="rootFilesfreebsd_gtk_powerpc64"/> ++ <antcall target="rootFilesfreebsd_gtk_powerpc64le"/> + <antcall target="rootFilesfreebsd_gtk_amd64"/> </target> <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform.launchers."> -diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml ---- rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/pom.xml.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/pom.xml 2021-03-08 21:06:05.486823000 +0100 @@ -54,27 +54,27 @@ </repositories> </profile> @@ -402,23 +412,68 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml </modules> </profile> </profiles> -@@ -88,8 +88,8 @@ +@@ -88,8 +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.ppc64le</module> - <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module> + <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</module> ++ <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le</module> + <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64</module> <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module> <module>bundles/org.eclipse.osgi.tests</module> -diff -ru rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties ---- rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties 0000-00-00 00:00:00.000000000 +0000 +--- rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties.orig 2020-05-28 15:19:35.000000000 +0200 ++++ rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties 2021-03-08 20:18:47.382294000 +0100 @@ -8,4 +8,4 @@ #j_linux.x86_64=/shared/common/jdk-1.6.0_10 #user names to use on each of the machines if different from the user running hudson, u_${os}.${arch} -u_linux.x86_64=swtbuild +u_freebsd.amd64=swtbuild +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/.project.orig 2021-03-08 21:42:53.881166000 +0100 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/.project 2021-03-08 21:44:11.973619000 +0100 +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> +- <name>org.eclipse.equinox.launcher.gtk.linux.ppc64le</name> ++ <name>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le</name> + <comment></comment> + <projects> + </projects> +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF.orig 2021-03-08 21:42:40.022621000 +0100 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/META-INF/MANIFEST.MF 2021-03-08 21:43:38.177892000 +0100 +@@ -2,9 +2,9 @@ + Bundle-ManifestVersion: 2 + Bundle-Name: %pluginName + Bundle-Vendor: %providerName +-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true ++Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le;singleton:=true + Bundle-Version: 1.1.1200.qualifier + Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" +-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) +-Bundle-Localization: launcher.gtk.linux.ppc64le ++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64le)) ++Bundle-Localization: launcher.gtk.freebsd.powerpc64le + Eclipse-BundleShape: dir +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml.orig 2021-03-08 21:42:26.004849000 +0100 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le/pom.xml 2021-03-08 21:43:17.841469000 +0100 +@@ -18,14 +18,14 @@ + <relativePath>../../launcher-binary-parent</relativePath> + </parent> + <groupId>org.eclipse.equinox</groupId> +- <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId> ++ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le</artifactId> + <version>1.1.1200-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <properties> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>ppc64le</arch> ++ <arch>powerpc64le</arch> + <skipAPIAnalysis>true</skipAPIAnalysis> + </properties> + </project> diff --git a/java/eclipse/scripts/pre-build b/java/eclipse/scripts/pre-build index 55d3eb971649..4529b4089fec 100644 --- a/java/eclipse/scripts/pre-build +++ b/java/eclipse/scripts/pre-build @@ -4,7 +4,7 @@ # cd ${WRKSRC} -ARCHS="amd64 powerpc64" +ARCHS="amd64 powerpc64 powerpc64le" # Create dummy repo for jgit if [ ! -d .git ] diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch index 6d04121a2034..ce79ba5c029a 100644 --- a/java/eclipse/scripts/pre-patch +++ b/java/eclipse/scripts/pre-patch @@ -42,6 +42,10 @@ do NEWNAME=$(rename_arch ${D}) mv ${D} ${NEWNAME} + case ${NEWNAME} in + *.powerpc64) + cp -rf ${NEWNAME} `echo ${NEWNAME} | sed -e 's/powerpc64/powerpc64le/'`;; + esac done # Clean up binaries |