Index: head/java/eclipse/files/patch-eclipse-platform-parent
===================================================================
--- head/java/eclipse/files/patch-eclipse-platform-parent (revision 567876)
+++ head/java/eclipse/files/patch-eclipse-platform-parent (revision 567877)
@@ -1,43 +1,49 @@
-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.
-->
- https://download.eclipse.org/eclipse/updates/4.16-I-builds/
+ https://download.eclipse.org/eclipse/updates/4.16/
- https://download.eclipse.org/eclipse/updates/4.16-I-builds
+ https://download.eclipse.org/eclipse/updates/4.16
- https://download.eclipse.org/eclipse/updates/4.16-I-builds
+ https://download.eclipse.org/eclipse/updates/4.16
Index: head/java/eclipse/files/patch-eclipse.pde.ui
===================================================================
--- head/java/eclipse/files/patch-eclipse.pde.ui (revision 567876)
+++ head/java/eclipse/files/patch-eclipse.pde.ui (revision 567877)
@@ -1,14 +1,14 @@
-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 @@
-
-
+
++
+
Index: head/java/eclipse/files/patch-eclipse.platform.releng
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.releng (revision 567876)
+++ head/java/eclipse/files/patch-eclipse.platform.releng (revision 567877)
@@ -1,84 +1,99 @@
-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"/>
++
++
+
+
-
+
-
+
++
-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 @@
features/org.eclipse.releng.tools
features/org.eclipse.sdk
features/org.eclipse.sdk.examples-feature
+
features/org.eclipse.test-feature
Index: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder (revision 567876)
+++ head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder (revision 567877)
@@ -1,235 +1,237 @@
-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">
+ name="FreeBSD (64 bit version)"
+ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-amd64.tar.gz">
++
-+ name="FreeBSD (64 bit version for Power PC)"
-+ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz">
++ name="FreeBSD (64 bit little-endian version for Power PC)"
++ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64le.tar.gz">
+ name="FreeBSD (64 bit version)"
+ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-amd64.tar.gz">
++
-+ name="FreeBSD (64 bit version for Power PC)"
-+ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz">
++ name="FreeBSD (64 bit little-endian version for Power PC)"
++ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64le.tar.gz">
+ name="FreeBSD (64 bit version)"
+ fileName="swt-${BUILD_ID}-gtk-freebsd-amd64.zip">
++
-+ name="FreeBSD (64 bit version for Power PC)"
-+ fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64.zip">
++ name="FreeBSD (64 bit little-endian version for Power PC)"
++ fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64le.zip">
p2
- linux
+ freebsd
gtk
- x86_64
+ amd64
win32
-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 @@
-
-
+
+
++
-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 @@
-
+
-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 @@
p2
- linux
+ freebsd
gtk
- x86_64
+ amd64
win32
@@ -91,7 +91,7 @@
zip
- tar.gz
+ tar.gz
tar.gz
-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 @@
-
+
-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 @@
zip
- tar.gz
+ tar.gz
tar.gz
-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 @@
-
+
-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 @@
platform
platform.sdk
sdk
+
-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 @@
-
+
-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
-root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
-root.linux.gtk.ppc64le.permissions.755=eclipse
+root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64
+root.freebsd.gtk.powerpc64.permissions.755=eclipse
-root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
-root.linux.gtk.x86_64.permissions.755=eclipse
++root.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 @@
-
+
-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 @@
zip
- tar.gz
+ tar.gz
tar.gz
-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 @@
-
+
Index: head/java/eclipse/files/patch-eclipse.platform.resources
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.resources (revision 567876)
+++ head/java/eclipse/files/patch-eclipse.platform.resources (revision 567877)
@@ -1,174 +1,204 @@
-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
#Set this to be your OS type
-OS_TYPE = linux
+OS_TYPE = freebsd
#Set this to be the location of your JRE
ifeq (${JAVA_HOME},)
@@ -28,15 +28,11 @@
endif
JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
-OPT_FLAGS=-O2 -g -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+OPT_FLAGS=-O2 -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
core:
- gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
- gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
+ ${CC} $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
+ ${CC} $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
clean:
rm -f $(CORE.O) $(LIB_NAME_FULL)
-
-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 @@
- org.eclipse.core.filesystem.linux.x86_64
+ org.eclipse.core.filesystem.freebsd.amd64
-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
Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.amd64; singleton:=true
Bundle-Version: 1.2.300.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.7.200,2.0.0)"
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 @@
../../
org.eclipse.core
- org.eclipse.core.filesystem.linux.x86_64
+ org.eclipse.core.filesystem.freebsd.amd64
1.2.300-SNAPSHOT
eclipse-plugin
@@ -33,9 +33,9 @@
p2
- linux
+ freebsd
gtk
- x86_64
+ amd64
@@ -50,7 +50,7 @@
native
- gtk.linux.x86_64
+ gtk.freebsd.amd64
@@ -63,10 +63,10 @@
process-resources
-
-
-
-
+
+
+
+
-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
Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.ppc64le;singleton:=true
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.powerpc64;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=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 @@
../../
org.eclipse.core
- org.eclipse.core.filesystem.linux.ppc64le
+ org.eclipse.core.filesystem.freebsd.powerpc64
1.4.100-SNAPSHOT
eclipse-plugin
@@ -37,9 +37,9 @@
p2
- linux
+ freebsd
gtk
- ppc64le
+ powerpc64
-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 @@
+ ../../
+
+ org.eclipse.core
+- org.eclipse.core.filesystem.linux.ppc64le
++ org.eclipse.core.filesystem.freebsd.powerpc64le
+ 1.4.100-SNAPSHOT
+ eclipse-plugin
+@@ -37,9 +37,9 @@
+ p2
+
+
+- linux
++ freebsd
+ gtk
+- ppc64le
++ powerpc64le
+
+
+
+--- 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 @@
+
bundles/org.eclipse.core.filesystem
- bundles/org.eclipse.core.filesystem.linux.ppc64le
- bundles/org.eclipse.core.filesystem.linux.x86_64
+ bundles/org.eclipse.core.filesystem.freebsd.powerpc64
++ bundles/org.eclipse.core.filesystem.freebsd.powerpc64le
+ bundles/org.eclipse.core.filesystem.freebsd.amd64
bundles/org.eclipse.core.filesystem.macosx
bundles/org.eclipse.core.filesystem.win32.x86_64
-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 -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:
* IBM Corporation - initial API and implementation
- * Pierre-Yves B., pyvesdev@gmail.com - Bug 219750: [styled text] Typing ~~ inserts é~~
+ * Pierre-Yves B., pyvesdev@gmail.com - Bug 219750
*******************************************************************************/
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$
if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
- if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$
return osArch;
}
static String os() {
String osName = System.getProperty("os.name"); //$NON-NLS-1$
+ if (osName.equals ("FreeBSD")) return "freebsd"; //$NON-NLS-1$ $NON-NLS-2$
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`
-MAKE_TYPE=make
+MAKE_TYPE=gmake
export CFLAGS='-O -Wall -fPIC'
@@ -86,21 +86,14 @@
MAKEFILE=make_win32.mak
;;
*)
- SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
+ SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'`
MAKEFILE=make_linux.mak
;;
esac
# Determine which CPU type we are building for
if [ "${MODEL}" = "" ]; then
- if uname -i > /dev/null 2>&1; then
- MODEL=`uname -i`
- if [ ${MODEL} = 'unknown' ]; then
- MODEL=`uname -m`
- fi
- else
MODEL=`uname -m`
- fi
fi
case $MODEL in
"x86_64")
-@@ -111,6 +104,11 @@
+@@ -111,6 +104,16 @@
SWT_ARCH=x86
AWT_ARCH=i386
;;
+ "powerpc" | "powerpc64")
+ SWT_ARCH=ppc64
+ 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
+ "freebsd.ppc64")
+ 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
+ ;;
++ "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
+ fi
+ if [ ${SWT_OS} = "freebsd" ]
+ then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
+ export SWT_LFLAGS=-m64
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
+port_prefix=`pkg-config --variable=prefix gtk+-3.0`
CFLAGS := $(CFLAGS) \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
$(SWT_DEBUG) \
$(SWT_WEBKIT_DEBUG) \
- -DLINUX -DGTK \
+ -DFREEBSD -DGTK \
+ -I$(port_prefix)/include \
-I$(JAVA_HOME)/include \
- -I$(JAVA_HOME)/include/linux \
+ -I$(JAVA_HOME)/include/freebsd \
${SWT_PTR_CFLAGS}
-LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+LFLAGS = -shared -fPIC -m64 ${SWT_LFLAGS} -L$(port_prefix)/lib
ifndef NO_STRIP
# -s = Remove all symbol table and relocation information from the executable.
@@ -255,10 +257,6 @@
cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
@# Copy webextension into it's own folder, but create folder first.
- @# CAREFULLY delete '.so' files inside webextension*. Then carefully remove the directories. 'rm -rf' seemed too risky of an approach.
- @-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so)" ] && rm -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so`
- @-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*)" ] && rmdir -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*`
-
@# Copying webextension is not critical for build to succeed, thus we use '-'. SWT can still function without a webextension.
@-[ -d $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) ] || mkdir -v $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) # If folder does not exist, make it.
-cp $(WEBKIT_EXTENSION_LIB) $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)/
-diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000
+--- 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 */
String osName = System.getProperty ("os.name");
- boolean isLinux = false, isWin32 = false;
- if (osName.equals ("Linux")) isLinux = true;
+ boolean isLinux = osName.equals ("Linux") || osName.equals ("FreeBSD");
+ boolean isWin32 = false;
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
*/
- static final int ASYNC_EXEC_TIMEOUT_MS = 10000;
+ static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
/** 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
-requires.4.name = org.eclipse.swt.gtk.linux.x86_64
+requires.4.name = org.eclipse.swt.gtk.freebsd.amd64
requires.4.range = [$version$,$version$]
-requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
+requires.4.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=amd64)(!(org.eclipse.swt.buildtime=true)))
requires.5.namespace = org.eclipse.equinox.p2.iu
-requires.5.name = org.eclipse.swt.gtk.linux.ppc64le
+requires.5.name = org.eclipse.swt.gtk.freebsd.powerpc64
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 @@
-
+
-
-+
++
++
++
++
++
-@@ -80,12 +80,12 @@
+
+
+@@ -80,12 +84,12 @@
-
-+
++
-
-+
++
-@@ -115,13 +115,13 @@
+@@ -115,14 +119,22 @@
trust="true"
outputproperty="m_linux_x86_64_output"
command="hostname"/>
-
++
-
+
-
-
+
+
++
++
++
++
++
++
-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">
-+ 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))?)?"/>
unix
- Linux
+
@@ -118,7 +119,9 @@
examples/org.eclipse.swt.examples.ole.win32
examples/org.eclipse.swt.examples.views
tests/org.eclipse.swt.tests.fragments.feature
+
features/org.eclipse.swt.tools.feature
-diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
---- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000
+--- 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 @@
++
++
-
+
-
+
-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 @@
../binaries-parent/
org.eclipse.swt
- org.eclipse.swt.gtk.linux.aarch64
+ org.eclipse.swt.gtk.freebsd.aarch64
3.114.100-SNAPSHOT
eclipse-plugin
- linux
+ freebsd
gtk
aarch64
${buildId}
@@ -61,7 +61,7 @@
native
- gtk.linux.aarch64
+ gtk.freebsd.aarch64
-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 @@
- org.eclipse.swt.gtk.linux.x86_64
+ org.eclipse.swt.gtk.freebsd.amd64
-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
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
Bundle-Version: 3.114.100.qualifier
Bundle-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=x86_64))
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
SWT-WS: gtk
-SWT-OS: linux
-SWT-Arch: x86_64
-Automatic-Module-Name: org.eclipse.swt.gtk.linux.x86_64
+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 @@
-
+
-
-
+
+
-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
echo " Copying generated *.jar files into your ${DEV_ECLIPSE} folder"
- cp -v ./target/org.eclipse.swt.gtk.linux.x86_64-*-SNAPSHOT.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64_*
- cp -v ./target/org.eclipse.swt.gtk.linux.x86_64-*-SNAPSHOT-sources.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64.source_*.jar
+ cp -v ./target/org.eclipse.swt.gtk.freebsd.amd64-*-SNAPSHOT.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64_*
+ cp -v ./target/org.eclipse.swt.gtk.freebsd.amd64-*-SNAPSHOT-sources.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64.source_*.jar
echo "Note: Below should list newly generated *jar files with current timestamp"
- ls -l --color=auto -a ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64*
+ ls -l --color=auto -a ${DEV_ECLIPSE}/plugins/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 @@
../binaries-parent/
org.eclipse.swt
- org.eclipse.swt.gtk.linux.x86_64
+ org.eclipse.swt.gtk.freebsd.amd64
3.114.100-SNAPSHOT
eclipse-plugin
- linux
+ freebsd
gtk
- x86_64
+ amd64
${buildId}
@@ -61,7 +61,7 @@
native
- gtk.linux.x86_64
+ gtk.freebsd.amd64
-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
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
Bundle-Version: 3.114.100.qualifier
Bundle-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=powerpc64))
SWT-WS: gtk
-SWT-OS: linux
-SWT-Arch: ppc64le
-Automatic-Module-Name: org.eclipse.swt.gtk.linux.ppc64le
+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 @@
-
+
-
-
+
+
-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 @@
../binaries-parent/
org.eclipse.swt
- org.eclipse.swt.gtk.linux.ppc64le
+ org.eclipse.swt.gtk.freebsd.powerpc64
3.114.100-SNAPSHOT
eclipse-plugin
- linux
+ freebsd
gtk
- ppc64le
+ powerpc64
${buildId}
@@ -61,7 +61,7 @@
native
- gtk.linux.ppc64le
+ gtk.freebsd.powerpc64
-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 @@
+
+-
++
+
+-
+-
++
++
+
+
+
+--- 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 @@
+ ../binaries-parent/
+
+ org.eclipse.swt
+- org.eclipse.swt.gtk.linux.ppc64le
++ org.eclipse.swt.gtk.freebsd.powerpc64le
+ 3.114.100-SNAPSHOT
+ eclipse-plugin
+
+
+- linux
++ freebsd
+ gtk
+- ppc64le
++ powerpc64le
+ ${buildId}
+
+
+@@ -61,7 +61,7 @@
+
+
+ native
+- gtk.linux.ppc64le
++ gtk.freebsd.powerpc64le
+
+
+
+--- 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 @@
+
bundles/org.eclipse.swt.cocoa.macosx.x86_64
- bundles/org.eclipse.swt.gtk.linux.ppc64le
- bundles/org.eclipse.swt.gtk.linux.x86_64
+ bundles/org.eclipse.swt.gtk.freebsd.powerpc64
++ bundles/org.eclipse.swt.gtk.freebsd.powerpc64le
+ bundles/org.eclipse.swt.gtk.freebsd.amd64
bundles/org.eclipse.swt.win32.win32.x86_64
Index: head/java/eclipse/files/patch-eclipse.platform.ui
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.ui (revision 567876)
+++ head/java/eclipse/files/patch-eclipse.platform.ui (revision 567877)
@@ -1,185 +1,206 @@
-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 @@
p2
- linux
+ freebsd
gtk
- x86_64
+ amd64
-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 @@
@@ -104,28 +104,28 @@
usr/bin/google-chrome
usr/bin/chromium-browser
usr/bin/konqueror
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;
String os = System.getProperty("os.name"); //$NON-NLS-1$
- if (Constants.OS_LINUX.equalsIgnoreCase(os)) {
+ if (Constants.OS_LINUX.equalsIgnoreCase(os) ||
+ Constants.OS_FREEBSD.equalsIgnoreCase(os)) {
tw += 1; // See Bug 342610
}
if (bsize != null)
@@ -584,4 +585,4 @@
target.setTransfer(transferTypes);
target.addDropListener(listener);
}
-}
\ 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"
label="%theme.dark"
- os="linux">
+ os="freebsd">
+ os="freebsd">
+
+
++
++
++
++
-
-
+
++
+
Index: head/java/eclipse/files/patch-rt.equinox.framework
===================================================================
--- head/java/eclipse/files/patch-rt.equinox.framework (revision 567876)
+++ head/java/eclipse/files/patch-rt.equinox.framework (revision 567877)
@@ -1,424 +1,479 @@
-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
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true
Bundle-Version: 1.1.1200.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
-Bundle-Localization: launcher.gtk.linux.aarch64
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64))
+Bundle-Localization: launcher.gtk.freebsd.aarch64
Eclipse-BundleShape: dir
-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 @@
../../launcher-binary-parent
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.aarch64
+ org.eclipse.equinox.launcher.gtk.freebsd.aarch64
1.1.1200-SNAPSHOT
eclipse-plugin
- linux
+ freebsd
gtk
aarch64
true
-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 @@
- org.eclipse.equinox.launcher.gtk.linux.x86_64
+ org.eclipse.equinox.launcher.gtk.freebsd.amd64
-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
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true
Bundle-Version: 1.1.1200.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
-Bundle-Localization: launcher.gtk.linux.x86_64
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
+Bundle-Localization: launcher.gtk.freebsd.amd64
Eclipse-BundleShape: dir
-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
###############################################################################
-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 @@
../../launcher-binary-parent
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.x86_64
+ org.eclipse.equinox.launcher.gtk.freebsd.amd64
1.1.1200-SNAPSHOT
eclipse-plugin
- linux
+ freebsd
gtk
- x86_64
+ amd64
true
-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 @@
- org.eclipse.equinox.launcher.gtk.linux.ppc64le
+ org.eclipse.equinox.launcher.gtk.freebsd.powerpc64
-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
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true
Bundle-Version: 1.1.1200.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
-Bundle-Localization: launcher.gtk.linux.ppc64le
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64))
+Bundle-Localization: launcher.gtk.freebsd.powerpc64
Eclipse-BundleShape: dir
-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 @@
../../launcher-binary-parent
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.ppc64le
+ org.eclipse.equinox.launcher.gtk.freebsd.powerpc64
1.1.1200-SNAPSHOT
eclipse-plugin
- linux
+ freebsd
gtk
- ppc64le
+ powerpc64
true
-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
-root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
-root.linux.gtk.ppc64le.permissions.755=launcher
+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
-root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
-root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
+root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
+root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
-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"/>
++
++
-
-
+
++
+
-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
-root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
-root.linux.gtk.ppc64le.permissions.755=launcher
+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}
-root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
-root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
+root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
+root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
-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 @@
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-+
-+
-+
-+
++
++
++
++
-
-+
++
-
-
-
-
++
++
++
++
+
+
+-
++
+
+
+
+
+
-
-
--
++
++
+
-
++
-@@ -138,8 +138,8 @@
+
+@@ -138,8 +146,9 @@
-
-
+
++
+
-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 @@
- build-native-launchers-gtk.linux.arm
+ build-native-launchers-gtk.freebsd.armv7
native
- gtk.linux.arm
+ gtk.freebsd.armv7
- bundles/org.eclipse.equinox.launcher.gtk.linux.arm
+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7
- build-native-launchers-gtk.linux.aarch64
+ build-native-launchers-gtk.freebsd.aarch64
native
- gtk.linux.aarch64
+ gtk.freebsd.aarch64
- bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64
+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64
-@@ -88,8 +88,8 @@
+@@ -88,8 +88,9 @@
bundles/org.eclipse.equinox.launcher
bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
- bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le
- bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64
+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64
++ bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le
+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64
bundles/org.eclipse.equinox.launcher.win32.win32.x86_64
bundles/org.eclipse.osgi.tests
-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 @@
+
+
+- org.eclipse.equinox.launcher.gtk.linux.ppc64le
++ org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le
+
+
+
+--- 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 @@
+ ../../launcher-binary-parent
+
+ org.eclipse.equinox
+- org.eclipse.equinox.launcher.gtk.linux.ppc64le
++ org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le
+ 1.1.1200-SNAPSHOT
+ eclipse-plugin
+
+
+- linux
++ freebsd
+ gtk
+- ppc64le
++ powerpc64le
+ true
+
+
Index: head/java/eclipse/scripts/pre-build
===================================================================
--- head/java/eclipse/scripts/pre-build (revision 567876)
+++ head/java/eclipse/scripts/pre-build (revision 567877)
@@ -1,29 +1,29 @@
#!/bin/sh
#
# Build quirks
#
cd ${WRKSRC}
-ARCHS="amd64 powerpc64"
+ARCHS="amd64 powerpc64 powerpc64le"
# Create dummy repo for jgit
if [ ! -d .git ]
then
mkdir ${WRKDIR}/githome
(
export HOME=${WRKDIR}/githome
git config --global user.email "eclipse@freebsd.org"
git config --global user.name "Eclipse"
git init
git add .
git commit -q --message="java/eclipse" --author="Eclipse "
)
fi
# Create dummy targets
GTK_EXE="rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk"
for A in ${ARCHS}
do
mkdir -p ${GTK_EXE}/freebsd/${A}
touch ${GTK_EXE}/freebsd/${A}/eclipse
done
Index: head/java/eclipse/scripts/pre-patch
===================================================================
--- head/java/eclipse/scripts/pre-patch (revision 567876)
+++ head/java/eclipse/scripts/pre-patch (revision 567877)
@@ -1,48 +1,52 @@
#!/bin/sh
#
# Reorg source files, reusing Linux sources as the base for FreeBSD builds.
#
LINUX_DIRS="
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*
eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.*
eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux
eclipse.platform.team/bundles/org.eclipse.core.net.linux.*
eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux
rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.*
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.*
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.*"
rename_arch ()
{
# Rename to FreeBSD TARGET_ARCH names
F=$(echo $1 | sed -e s/linux/freebsd/)
case $F in
*.arm)
echo $(echo $F | sed -e 's/arm/armv7/');;
*.ppc64le)
echo $(echo $F | sed -e 's/ppc64le/powerpc64/');;
*.x86)
echo $(echo $F | sed -e 's/x86/i386/');;
*.x86_64)
echo $(echo $F | sed -e 's/x86_64/amd64/');;
*)
echo ${F};;
esac
}
cd ${WRKSRC}
for D in ${LINUX_DIRS}
do
if [ ! -e ${D} ]
then
echo "ERROR: ${D} not found"
continue
fi
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
rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux