Attachment #206289 for bug #239650




# $FreeBSD$

PORTNAME=	eclipse
PORTVERSION=	4.12
PORTREVISION=	1
CATEGORIES=	java devel

# Update to git-tag on git.eclipse.org
ECLIPSE_TAG=	R4_12
ECLIPSE_TSTAMP=	20190617-0403

ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
ECLIPSE_MODULES=jdt/eclipse.jdt \

		equinox/rt.equinox.p2
# Each Eclipse module has its own MASTER_SITE
.for M in ${ECLIPSE_MODULES}
MASTER_SITES+=	https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} \
		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g}
DISTFILES+=	${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
.endfor

DIST_SUBDIR=	${PORTNAME}

MAINTAINER=	jonc@chen.org.nz
COMMENT=	Eclipse IDE 2019-06

LICENSE=	EPL


GH_ACCOUNT=	daemonblade
GH_PROJECT=	eclipse-maven-repo

USE_JAVA=	8
JAVA_VERSION=	1.8

DESKTOP_ENTRIES="Eclipse" \
		"${COMMENT}" \


SUB_FILES=	${PORTNAME}

MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME}
MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
MAVEN_ECLIPSE=	-Dnative=gtk.freebsd.${ARCH} -Dcomparator.repo=file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/p2-stub -DforceContextQualifier=v${ECLIPSE_TSTAMP}





TIMESTAMP = 1564954773
SHA256 (eclipse/eclipse.jdt-R4_12.tar.xz) = 45ae25fb2da5f0dabb0a3e661cd7c0bdb7e64c11ef022ef69634b78b7c0d53e2
SIZE (eclipse/eclipse.jdt-R4_12.tar.xz) = 37540
SHA256 (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 5e2397a22ac6b4c8c4335da21c51c53f391b7aa22287e8c2a0a51d32ca56a735
SIZE (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 8454552
SHA256 (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = e7ff8a3148707694b14140abdaa40feca610694f3b729c0851abaab321063b7d
SIZE (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = 34416416
SHA256 (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = a111fc4ff7f054a691cd27ae8999eac08d9a840a7dc44d09568573442ae1471a
SIZE (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = 1431080
SHA256 (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 375bce94a24c56a9ae23d3c0029b169abc3281feb4217678fdab0903684f4762
SIZE (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 14583880
SHA256 (eclipse/eclipse.pde.build-R4_12.tar.xz) = 891a4bcc90cd96514f318eee9eaf96fc15159d77d1fc409ed249906acb68022e
SIZE (eclipse/eclipse.pde.build-R4_12.tar.xz) = 868404
SHA256 (eclipse/eclipse.pde.ui-R4_12.tar.xz) = cd075169014eaa1869c961bd1d5142289963639cbc7ba6d77807f94db660bea0
SIZE (eclipse/eclipse.pde.ui-R4_12.tar.xz) = 29767800
SHA256 (eclipse/eclipse.platform-R4_12.tar.xz) = ddf3a506a37cf8d9a3710075b3317e672e6be3c7b862d4040fdfbec79dd4ea8e
SIZE (eclipse/eclipse.platform-R4_12.tar.xz) = 1371240
SHA256 (eclipse/eclipse.platform.common-R4_12.tar.xz) = 135bae9bde971e0d554baef0f7d5490856d328872aba4cbd6f4de6dd9ec45716
SIZE (eclipse/eclipse.platform.common-R4_12.tar.xz) = 34509332
SHA256 (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 73794b36665ff3d5e91a9192580b0d13adf7465c84ecb348968ca1b442102b7e
SIZE (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 1372736
SHA256 (eclipse/eclipse.platform.releng-R4_12.tar.xz) = b881cdf06b04a8b540a4eb78284f6bdbf0dc6609558a4ab47ab985f0b806bece
SIZE (eclipse/eclipse.platform.releng-R4_12.tar.xz) = 410360
SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = c7fe65208ca7e534305ea02b9121af7f1610aeb06d2699ccadd1df7aa0326d65
SIZE (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = 693384
SHA256 (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 5f52c24383d93097e4afbe4e7bd6219a503d3fb53d5753bef1e6788459f81790
SIZE (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 856912
SHA256 (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 249076673934470080f0978561f88bce094e0c5d020e9e310925f8cd0a0d79ee
SIZE (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 432824
SHA256 (eclipse/eclipse.platform.swt-R4_12.tar.xz) = e32661c3d7d1593fb38a3d0c19d015cf0e257cd25c80c74acbd95e2c5e7c0a29
SIZE (eclipse/eclipse.platform.swt-R4_12.tar.xz) = 3526948
SHA256 (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 29959c650f57cc6fa93f301a3d4a3e4648ecfeeedcb9ad665f7bb35672f44d5d
SIZE (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 579236
SHA256 (eclipse/eclipse.platform.team-R4_12.tar.xz) = a4dae95b11dcdfec3f7481582be72ce5145e91096d6f2b654958a0afea601bab
SIZE (eclipse/eclipse.platform.team-R4_12.tar.xz) = 4633400
SHA256 (eclipse/eclipse.platform.text-R4_12.tar.xz) = 5ce41cb1f01f4fd1960f6f12e8e4e78dd8140b45657ac911be8deedfc6ce9953
SIZE (eclipse/eclipse.platform.text-R4_12.tar.xz) = 1248060
SHA256 (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 28a705e7ea2a0bb9739bfba031373215601c61e75f7d99e0635b5f08f30f8d98
SIZE (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 4510416
SHA256 (eclipse/eclipse.platform.ui-R4_12.tar.xz) = dbd4e45afe474d149cc5a5bfd767a68caa3a24fe106004a55fca18e412a7f92a
SIZE (eclipse/eclipse.platform.ui-R4_12.tar.xz) = 5937024
SHA256 (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 610cfc9ac0e57114ddd6985a5a1ce0179f54397d2a2295de29166ece08af2daf
SIZE (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 318476
SHA256 (eclipse/rt.equinox.binaries-R4_12.tar.xz) = b439a66d4a28aad2bb4ea6ae5adddf39a95c9d1c348923c258f42c683f1ffb7f
SIZE (eclipse/rt.equinox.binaries-R4_12.tar.xz) = 624016
SHA256 (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 4e0a2c72e0f459231fc51607b03598274902e04b308d3028ba9d30b57cb8a81d
SIZE (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 1141852
SHA256 (eclipse/rt.equinox.framework-R4_12.tar.xz) = 8d154acf89d503cdd6ee8a83854a4a69d14f15430089a71f80bcb3a603d32b55
SIZE (eclipse/rt.equinox.framework-R4_12.tar.xz) = 2813400
SHA256 (eclipse/rt.equinox.p2-R4_12.tar.xz) = c3972cb745756fbea87ca0098803c538d1fc300637bbc1062fe359f0ca72dbc8
SIZE (eclipse/rt.equinox.p2-R4_12.tar.xz) = 48502480
SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 43093df29b4ecbbabe8806ca24f1dcc4fa53b2b0d85a59d2664fc8f3fe8d8e90
SIZE (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 182037029




       'eclipiserun-repo' repository, such as for computing .api-descriptions and
       generating API Tools reports.
     -->
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.12-I-builds/</eclipserun-repo>
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.12/</eclipserun-repo>
     
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12-I-builds</comparator.repo>
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12</comparator.repo>
 
     <!--
       NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.

       it).
       And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable.
     -->
-    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646</emf-repo.url>
+    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.18</emf-repo.url>
 
     <ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.5/site.p2/</ecf-repo.url>
 
@@ -262,14 +262,14 @@
           </target>

             </environment>
             <environment>
               <os>win32</os>
@@ -639,7 +639,7 @@
           For maintenance streams should always be "M-builds".
           Ideally, this value would be provided by the environment, see bug 489789.
         -->
-        <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.11-I-builds</eclipse-p2-repo.url>
+        <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.11</eclipse-p2-repo.url>
       </properties>
       <repositories>
         <repository>

Lines 2-12 Link Here

(-)./files/patch-eclipse.platform.releng.prereqs.sdk (-4 / +4 lines)
2	--- eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000	2	--- eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000
3	+++ eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000	3	+++ eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000
4	@@ -167,7 +167,7 @@	4	@@ -167,7 +167,7 @@
5	<unit id="org.eclipse.emf.edit" version="2.14.0.v20180823-0456"/>	5	<unit id="org.eclipse.emf.edit" version="2.15.0.v20190528-0725"/>
6	<unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/>	6	<unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/>
7	<unit id="org.eclipse.emf.databinding.edit" version="1.5.0.v20180823-0456"/>	7	<unit id="org.eclipse.emf.databinding.edit" version="1.6.0.v20190323-1031"/>
8	- <repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/"/>	8	- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646"/>
9	+ <repository location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/"/>	9	+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.18"/>
10	</location>	10	</location>
11		11
12	<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">	12	<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">




 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
 
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.11-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.11-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.11-macosx-cocoa-x86_64.tar.gz
 
diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
@@ -8,9 +8,9 @@
 
 
 mkdir -p workarea/${buildId}/eclipse-testing
 #cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-SDK-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-platform-4.10-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/
+cp ../../eclipse-SDK-${buildId}-freebsd-gtk-amd64.tar.gz workarea/${buildId}/eclipse-testing/

Lines 1-7 Link Here

(-)./files/patch-eclipse.platform.runtime (-1 / +1 lines)
1	diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	1	diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
2	--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000	2	--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000
3	+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000	3	+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000
4	@@ -59,7 +59,7 @@	4	@@ -63,7 +63,7 @@
5	//XXX This is not synchronized	5	//XXX This is not synchronized
6	private Map<Bundle,Log> logs = new HashMap<>(5);	6	private Map<Bundle,Log> logs = new HashMap<>(5);
7		7




diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	0000-00-00 00:00:00.000000000 +0000
@@ -69,12 +69,12 @@
 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$

 	"linux.x86")
 		if [ "${CC}" = "" ]; then
 			export CC=gcc
@@ -194,7 +199,7 @@
 
 
 # For 64-bit CPUs, we have a switch

 	SWT_PTR_CFLAGS=-DJNI64
 	if [ -d /lib64 ]; then
 		XLIB64=-L/usr/X11R6/lib64
@@ -205,6 +210,11 @@
 		XLIB64="${XLIB64} -L/usr/lib64"
 		SWT_LFLAGS=-m64
 		export SWT_LFLAGS

 	fi
 	export SWT_PTR_CFLAGS
 fi
@@ -364,4 +377,4 @@
 elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
 	export GTK_VERSION="3.0"
 	func_build_gtk3 "$@"
-fi
\ No newline at end of file
+fi
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000

 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/buildFragment.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
--- eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml	0000-00-00 00:00:00.000000000 +0000
@@ -237,8 +237,9 @@
 		<condition property="is64" value="true">
 			<or>
 				<equals arg1="${swt.arch}" arg2="x86_64"/>
+				<equals arg1="${swt.arch}" arg2="amd64"/>
 				<equals arg1="${swt.arch}" arg2="ia64"/>
-				<equals arg1="${swt.arch}" arg2="ppc64le"/>
+				<equals arg1="${swt.arch}" arg2="powerpc64"/>
 				<equals arg1="${swt.arch}" arg2="s390x"/>
 				<equals arg1="${swt.arch}" arg2="sparcv9"/>
 				<equals arg1="${swt.arch}" arg2="aarch64"/>
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	0000-00-00 00:00:00.000000000 +0000

 			<filename regex="[0-9][0-9][0-9][0-9]."/>
 			<filename regex="${swt_version}." negate="true"/>
 			<exclude name="**/.git/**"/>
@@ -115,13 +115,13 @@
 			trust="true"
 			outputproperty="m_linux_x86_64_output"
 			command="hostname"/>

 			command="hostname"/>
 		<sshexec host="${m_mac}"
 			username="swtbuild"
@@ -139,10 +139,10 @@
 				<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/>
 			</and>
 		</condition>

 			</and>
 		</condition>
 		<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">
@@ -169,11 +169,11 @@
 		<echo></echo>
 		<echo>${m_linux_x86} - ${m_linux_x86_test}</echo>
 		<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>
-		<echo>${m_linux_ppc64le} - ${m_linux_ppc64le_test}</echo>
+		<echo>${m_linux_powerpc64} - ${m_linux_powerpc64_test}</echo>
 		<echo>${m_mac} - ${m_mac_test}</echo>
 		<echo>-------------------------</echo>
 		<condition property="m_fail">
-			<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/>
+			<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_powerpc64_test} ${m_mac_test}"/>
 		</condition>
 		<fail if="m_fail" message="Failed"/>
 	</target>
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




 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.111.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,8 +26,8 @@

   <groupId>org.eclipse.swt</groupId>
-  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
   <version>3.111.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

         </property>
       </activation>
       <build>
diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,7 +2,7 @@
 Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
 Bundle-Name: %fragmentName
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.arm; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.armv7; singleton:=true
 Bundle-Version: 3.109.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,8 +26,8 @@
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.gtk; x-internal:=true,
  org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm))
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=armv7))
 SWT-WS: gtk
-SWT-OS: linux
-SWT-Arch: arm
-Automatic-Module-Name: org.eclipse.swt.gtk.linux.arm
+SWT-OS: freebsd
+SWT-Arch: armv7
+Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.armv7
diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt.gtk.linux.arm" default="build.jars" basedir=".">
+<project name="org.eclipse.swt.gtk.freebsd.armv7" default="build.jars" basedir=".">
 
 	<property name="swt.ws" value="gtk" />
-	<property name="swt.os" value="linux" />
-	<property name="swt.arch" value="arm" />
+	<property name="swt.os" value="freebsd" />
+	<property name="swt.arch" value="armv7" />
 	<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.armv7/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -20,14 +20,14 @@
     <relativePath>../binaries-parent/</relativePath>
   </parent>
   <groupId>org.eclipse.swt</groupId>
-  <artifactId>org.eclipse.swt.gtk.linux.arm</artifactId>
+  <artifactId>org.eclipse.swt.gtk.freebsd.armv7</artifactId>
   <version>3.109.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
-    <os>linux</os>
+    <os>freebsd</os>
     <ws>gtk</ws>
-    <arch>arm</arch>
+    <arch>armv7</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.arm</value>
+          <value>gtk.freebsd.armv7</value>
         </property>
       </activation>
       <build>
diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
@@ -2,7 +2,7 @@
 Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
 Bundle-Name: %fragmentName
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.i386; singleton:=true
 Bundle-Version: 3.109.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,7 +26,7 @@
  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))
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386))
 SWT-WS: gtk
-SWT-OS: linux
-SWT-Arch: x86
+SWT-OS: freebsd
+SWT-Arch: i386
diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml	0000-00-00 00:00:00.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir=".">
+<project name="org.eclipse.swt.gtk.freebsd.i386" default="build.jars" basedir=".">
 
 	<property name="swt.ws" value="gtk" />
-	<property name="swt.os" value="linux" />
-	<property name="swt.arch" value="x86" />
+	<property name="swt.os" value="freebsd" />
+	<property name="swt.arch" value="i386" />
 	<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.i386/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml
--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
@@ -20,14 +20,14 @@
     <relativePath>../binaries-parent/</relativePath>
   </parent>
   <groupId>org.eclipse.swt</groupId>
-  <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+  <artifactId>org.eclipse.swt.gtk.freebsd.i386</artifactId>
   <version>3.109.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
-    <os>linux</os>
+    <os>freebsd</os>
     <ws>gtk</ws>
-    <arch>x86</arch>
+    <arch>i386</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.x86</value>
+          <value>gtk.freebsd.i386</value>
         </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

 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.111.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
@@ -26,8 +26,8 @@

   <groupId>org.eclipse.swt</groupId>
-  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
+  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
   <version>3.111.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

Lines 61-68 Link Here

(-)./files/patch-eclipse.platform.ui (-3 / +3 lines)
61	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	61	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
62	--- 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	62	--- 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
63	+++ 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	63	+++ 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
64	@@ -206,7 +206,8 @@	64	@@ -210,7 +210,8 @@
65	if (titleLabel.getVisible()) {	65	if (currentTitleControl.getVisible()) {
66	int tw = width - HMARGIN * 2 - SPACING * 2;	66	int tw = width - HMARGIN * 2 - SPACING * 2;
67	String os = System.getProperty("os.name"); //$NON-NLS-1$	67	String os = System.getProperty("os.name"); //$NON-NLS-1$
68	- if (Constants.OS_LINUX.equalsIgnoreCase(os)) {	68	- if (Constants.OS_LINUX.equalsIgnoreCase(os)) {
Lines 71-77 Link Here
71	tw += 1; // See Bug 342610	71	tw += 1; // See Bug 342610
72	}	72	}
73	if (bsize != null)	73	if (bsize != null)
74	@@ -543,4 +544,4 @@	74	@@ -584,4 +585,4 @@
75	target.setTransfer(transferTypes);	75	target.setTransfer(transferTypes);
76	target.addDropListener(listener);	76	target.addDropListener(listener);
77	}	77	}




 	private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$
 	private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$
 	private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$
@@ -746,7 +747,7 @@
 		// setup default values for known OSes if nothing was specified
 		if (osName.equals(Constants.OS_WIN32))
 			return Constants.WS_WIN32;

 			return Constants.WS_GTK;
 		if (osName.equals(Constants.OS_MACOSX))
 			return Constants.WS_COCOA;
@@ -769,6 +770,8 @@
 		// EXCEPTION: All mappings of SunOS convert to Solaris
 		if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS))
 			return Constants.OS_SOLARIS;

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 @@
                     <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/**/*"/>

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
@@ -54,27 +54,27 @@
       </repositories>
     </profile>
     <profile>

       </modules>
     </profile>
   </profiles>
@@ -88,8 +88,8 @@
     
     <module>bundles/org.eclipse.equinox.launcher</module>
     <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>




       <plugin id="org.eclipse.core.runtime"/>
       <plugin id="org.eclipse.e4.core.commands"/>
       <plugin id="org.eclipse.e4.core.contexts"/>
@@ -120,7 +120,7 @@
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.equinox.security"/>

       <plugin id="org.eclipse.equinox.security.ui"/>
       <plugin id="org.eclipse.equinox.simpleconfigurator"/>
       <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
@@ -134,7 +134,7 @@
       <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.swt"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>

diff -ru rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
@@ -184,9 +184,9 @@
          unpack="false"/>
 
    <plugin

Return to bug 239650

Lines 2-14 Link Here

(-)./Makefile (-9 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= eclipse	4	PORTNAME= eclipse
5	PORTVERSION= 4.11	5	PORTVERSION= 4.12
6	PORTREVISION= 1
7	CATEGORIES= java devel	6	CATEGORIES= java devel
8		7
9	# Update to git-tag on git.eclipse.org	8	# Update to git-tag on git.eclipse.org
10	ECLIPSE_TAG= R4_11	9	ECLIPSE_TAG= R4_12
11	ECLIPSE_TSTAMP= 20190321-0023	10	ECLIPSE_TSTAMP= 20190617-0403
12		11
13	ECLIPSE_SUFX= ${ECLIPSE_TAG}.tar.xz	12	ECLIPSE_SUFX= ${ECLIPSE_TAG}.tar.xz
14	ECLIPSE_MODULES=jdt/eclipse.jdt \	13	ECLIPSE_MODULES=jdt/eclipse.jdt \
Lines 38-51 Link Here
38	equinox/rt.equinox.p2	37	equinox/rt.equinox.p2
39	# Each Eclipse module has its own MASTER_SITE	38	# Each Eclipse module has its own MASTER_SITE
40	.for M in ${ECLIPSE_MODULES}	39	.for M in ${ECLIPSE_MODULES}
41	MASTER_SITES+= https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g}	40	MASTER_SITES+= https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} \
		41	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g}
42	DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}	42	DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
43	.endfor	43	.endfor
44		44
45	DIST_SUBDIR= ${PORTNAME}	45	DIST_SUBDIR= ${PORTNAME}
46		46
47	MAINTAINER= jonc@chen.org.nz	47	MAINTAINER= jonc@chen.org.nz
48	COMMENT= Eclipse IDE 2019-03	48	COMMENT= Eclipse IDE 2019-06
49		49
50	LICENSE= EPL	50	LICENSE= EPL
51		51
Lines 62-69 Link Here
62	GH_ACCOUNT= daemonblade	62	GH_ACCOUNT= daemonblade
63	GH_PROJECT= eclipse-maven-repo	63	GH_PROJECT= eclipse-maven-repo
64		64
65	USE_JAVA= yes	65	USE_JAVA= 8
66	JAVA_VERSION= 1.8
67		66
68	DESKTOP_ENTRIES="Eclipse" \	67	DESKTOP_ENTRIES="Eclipse" \
69	"${COMMENT}" \	68	"${COMMENT}" \
Lines 74-80 Link Here
74		73
75	SUB_FILES= ${PORTNAME}	74	SUB_FILES= ${PORTNAME}
76		75
77	MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC}	76	MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME}
78	MAVEN_REPO= -Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}	77	MAVEN_REPO= -Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
79	MAVEN_ECLIPSE= -Dnative=gtk.freebsd.${ARCH} -Dcomparator.repo=file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/p2-stub -DforceContextQualifier=v${ECLIPSE_TSTAMP}	78	MAVEN_ECLIPSE= -Dnative=gtk.freebsd.${ARCH} -Dcomparator.repo=file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/p2-stub -DforceContextQualifier=v${ECLIPSE_TSTAMP}
80		79

Lines 1-53 Link Here

(-)./distinfo (-53 / +53 lines)
1	TIMESTAMP = 1554503098	1	TIMESTAMP = 1564954773
2	SHA256 (eclipse/eclipse.jdt-R4_11.tar.xz) = 69cfb50655af18880880ef4292e2856ad12d847527553bb7d13f2a3443f566ce	2	SHA256 (eclipse/eclipse.jdt-R4_12.tar.xz) = 45ae25fb2da5f0dabb0a3e661cd7c0bdb7e64c11ef022ef69634b78b7c0d53e2
3	SIZE (eclipse/eclipse.jdt-R4_11.tar.xz) = 37580	3	SIZE (eclipse/eclipse.jdt-R4_12.tar.xz) = 37540
4	SHA256 (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 903c7591a4698badbd279d09b2aefd3604820aba54cf2958e4fd5cfa0d806f24	4	SHA256 (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 5e2397a22ac6b4c8c4335da21c51c53f391b7aa22287e8c2a0a51d32ca56a735
5	SIZE (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 8371984	5	SIZE (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 8454552
6	SHA256 (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = ddcf1962d1b869c22cc31d0634d280e68b91a6c8f5561f64a5072e558460e7a2	6	SHA256 (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = e7ff8a3148707694b14140abdaa40feca610694f3b729c0851abaab321063b7d
7	SIZE (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = 34416600	7	SIZE (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = 34416416
8	SHA256 (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 028222dbe3d2ebc4002b3b362e0500a791e86ef9e4fca9a5d7a1bed97f9bc395	8	SHA256 (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = a111fc4ff7f054a691cd27ae8999eac08d9a840a7dc44d09568573442ae1471a
9	SIZE (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 1425276	9	SIZE (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = 1431080
10	SHA256 (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 28ca01db7a12183125b9794cd56bb0dd6b5ba449014bc8bfe9ac6991e63b5a77	10	SHA256 (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 375bce94a24c56a9ae23d3c0029b169abc3281feb4217678fdab0903684f4762
11	SIZE (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 14117296	11	SIZE (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 14583880
12	SHA256 (eclipse/eclipse.pde.build-R4_11.tar.xz) = 32496ccf12e630762fd59fd18ebc1bae9f96437f012aaeab5797ba29f6b2ddd7	12	SHA256 (eclipse/eclipse.pde.build-R4_12.tar.xz) = 891a4bcc90cd96514f318eee9eaf96fc15159d77d1fc409ed249906acb68022e
13	SIZE (eclipse/eclipse.pde.build-R4_11.tar.xz) = 868176	13	SIZE (eclipse/eclipse.pde.build-R4_12.tar.xz) = 868404
14	SHA256 (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 7ac38d3c2b52c030d7011395c94fe6dbdacc735a308911c1c0689388e54f6e87	14	SHA256 (eclipse/eclipse.pde.ui-R4_12.tar.xz) = cd075169014eaa1869c961bd1d5142289963639cbc7ba6d77807f94db660bea0
15	SIZE (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 29759352	15	SIZE (eclipse/eclipse.pde.ui-R4_12.tar.xz) = 29767800
16	SHA256 (eclipse/eclipse.platform-R4_11.tar.xz) = f9512fc71c40c37703b89617efdbd48f1fac4d4558e705b9a13596a567241a5d	16	SHA256 (eclipse/eclipse.platform-R4_12.tar.xz) = ddf3a506a37cf8d9a3710075b3317e672e6be3c7b862d4040fdfbec79dd4ea8e
17	SIZE (eclipse/eclipse.platform-R4_11.tar.xz) = 952108	17	SIZE (eclipse/eclipse.platform-R4_12.tar.xz) = 1371240
18	SHA256 (eclipse/eclipse.platform.common-R4_11.tar.xz) = a3062ed00ebe342a98e1132449d42987e104b741e1b86201c456af47fdd004c3	18	SHA256 (eclipse/eclipse.platform.common-R4_12.tar.xz) = 135bae9bde971e0d554baef0f7d5490856d328872aba4cbd6f4de6dd9ec45716
19	SIZE (eclipse/eclipse.platform.common-R4_11.tar.xz) = 34049880	19	SIZE (eclipse/eclipse.platform.common-R4_12.tar.xz) = 34509332
20	SHA256 (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 2e2b675035e808b121a9cb38cd5c26e35a6f2c38853f9dbd9db37d5e2ef1b921	20	SHA256 (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 73794b36665ff3d5e91a9192580b0d13adf7465c84ecb348968ca1b442102b7e
21	SIZE (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 1369408	21	SIZE (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 1372736
22	SHA256 (eclipse/eclipse.platform.releng-R4_11.tar.xz) = a550feae2316d591b0990460a053abc19dd87b80c86c351cce98bff33194ede9	22	SHA256 (eclipse/eclipse.platform.releng-R4_12.tar.xz) = b881cdf06b04a8b540a4eb78284f6bdbf0dc6609558a4ab47ab985f0b806bece
23	SIZE (eclipse/eclipse.platform.releng-R4_11.tar.xz) = 411064	23	SIZE (eclipse/eclipse.platform.releng-R4_12.tar.xz) = 410360
24	SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = c25d05c355585e5fcd6465a95899dd1eb6d2af92aab16d90bf0cdf3a6044c4fc	24	SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = c7fe65208ca7e534305ea02b9121af7f1610aeb06d2699ccadd1df7aa0326d65
25	SIZE (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = 690924	25	SIZE (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = 693384
26	SHA256 (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 59be5020229e5053909194c55d416a384b2cf00b7a578d8df50d80c6bb8c6948	26	SHA256 (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 5f52c24383d93097e4afbe4e7bd6219a503d3fb53d5753bef1e6788459f81790
27	SIZE (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 857244	27	SIZE (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 856912
28	SHA256 (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 70b9ea7151ea5c60feea289f3a8b7fcd66619f46f2ef2fde0a7ae2a034355330	28	SHA256 (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 249076673934470080f0978561f88bce094e0c5d020e9e310925f8cd0a0d79ee
29	SIZE (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 432764	29	SIZE (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 432824
30	SHA256 (eclipse/eclipse.platform.swt-R4_11.tar.xz) = b779fe217ac503b28b83fa1104b17cd99e8b6086bdb31be3f9efbd2f4135bc96	30	SHA256 (eclipse/eclipse.platform.swt-R4_12.tar.xz) = e32661c3d7d1593fb38a3d0c19d015cf0e257cd25c80c74acbd95e2c5e7c0a29
31	SIZE (eclipse/eclipse.platform.swt-R4_11.tar.xz) = 3535864	31	SIZE (eclipse/eclipse.platform.swt-R4_12.tar.xz) = 3526948
32	SHA256 (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 805b830cb1cc45895594c1ac5fb96173a968fa954a33cb90dacf57215b651796	32	SHA256 (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 29959c650f57cc6fa93f301a3d4a3e4648ecfeeedcb9ad665f7bb35672f44d5d
33	SIZE (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 1077336	33	SIZE (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 579236
34	SHA256 (eclipse/eclipse.platform.team-R4_11.tar.xz) = f4f36cb722f393e25626ea5131b4d9017f3d47d69f33f2982f7a6bdeda5b3dad	34	SHA256 (eclipse/eclipse.platform.team-R4_12.tar.xz) = a4dae95b11dcdfec3f7481582be72ce5145e91096d6f2b654958a0afea601bab
35	SIZE (eclipse/eclipse.platform.team-R4_11.tar.xz) = 4665536	35	SIZE (eclipse/eclipse.platform.team-R4_12.tar.xz) = 4633400
36	SHA256 (eclipse/eclipse.platform.text-R4_11.tar.xz) = da6fad72804338e40efa7572bf162e7f88dac8dc8a14eb2fe4f733ed47b0c6be	36	SHA256 (eclipse/eclipse.platform.text-R4_12.tar.xz) = 5ce41cb1f01f4fd1960f6f12e8e4e78dd8140b45657ac911be8deedfc6ce9953
37	SIZE (eclipse/eclipse.platform.text-R4_11.tar.xz) = 1247548	37	SIZE (eclipse/eclipse.platform.text-R4_12.tar.xz) = 1248060
38	SHA256 (eclipse/eclipse.platform.ua-R4_11.tar.xz) = a879ef849eaf4585832bd8203f167a031c4f05c9916dc5138ed541eba4f0a870	38	SHA256 (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 28a705e7ea2a0bb9739bfba031373215601c61e75f7d99e0635b5f08f30f8d98
39	SIZE (eclipse/eclipse.platform.ua-R4_11.tar.xz) = 4438264	39	SIZE (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 4510416
40	SHA256 (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 00e5235b09106bd2f23c01257d50330ff2ed7511bb4dbdbbbe21929e2f25dc85	40	SHA256 (eclipse/eclipse.platform.ui-R4_12.tar.xz) = dbd4e45afe474d149cc5a5bfd767a68caa3a24fe106004a55fca18e412a7f92a
41	SIZE (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 6013124	41	SIZE (eclipse/eclipse.platform.ui-R4_12.tar.xz) = 5937024
42	SHA256 (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 4cc9941e49bb5f10b9155649165643e9afe5b758b2d3e0807c7c368797963b03	42	SHA256 (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 610cfc9ac0e57114ddd6985a5a1ce0179f54397d2a2295de29166ece08af2daf
43	SIZE (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 316036	43	SIZE (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 318476
44	SHA256 (eclipse/rt.equinox.binaries-R4_11.tar.xz) = a4476629efbd4f5063ff42e0aebb9b75e0f40f667fa7a90152e6e1b14934e8f7	44	SHA256 (eclipse/rt.equinox.binaries-R4_12.tar.xz) = b439a66d4a28aad2bb4ea6ae5adddf39a95c9d1c348923c258f42c683f1ffb7f
45	SIZE (eclipse/rt.equinox.binaries-R4_11.tar.xz) = 623604	45	SIZE (eclipse/rt.equinox.binaries-R4_12.tar.xz) = 624016
46	SHA256 (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 4b1cada1dcb6b4cddd65f96a85740fcfe053722e836351f0e2ab53a54d531bc9	46	SHA256 (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 4e0a2c72e0f459231fc51607b03598274902e04b308d3028ba9d30b57cb8a81d
47	SIZE (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 1139768	47	SIZE (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 1141852
48	SHA256 (eclipse/rt.equinox.framework-R4_11.tar.xz) = 39ea7af8cb7c56e6b4819902de00f498f881c6b66599d5a5b275f2bd32765480	48	SHA256 (eclipse/rt.equinox.framework-R4_12.tar.xz) = 8d154acf89d503cdd6ee8a83854a4a69d14f15430089a71f80bcb3a603d32b55
49	SIZE (eclipse/rt.equinox.framework-R4_11.tar.xz) = 2812036	49	SIZE (eclipse/rt.equinox.framework-R4_12.tar.xz) = 2813400
50	SHA256 (eclipse/rt.equinox.p2-R4_11.tar.xz) = 019ec06efb58a12417c0a1ae9ecfdc368ab8e4ad25364970bd112dc03b9a53c8	50	SHA256 (eclipse/rt.equinox.p2-R4_12.tar.xz) = c3972cb745756fbea87ca0098803c538d1fc300637bbc1062fe359f0ca72dbc8
51	SIZE (eclipse/rt.equinox.p2-R4_11.tar.xz) = 45251216	51	SIZE (eclipse/rt.equinox.p2-R4_12.tar.xz) = 48502480
52	SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = ab9e83997cccc02c235c8d3aa67db6f9963b25ede3d22d961d9292925a2f6bfa	52	SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 43093df29b4ecbbabe8806ca24f1dcc4fa53b2b0d85a59d2664fc8f3fe8d8e90
53	SIZE (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = 167655977	53	SIZE (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 182037029

Lines 5-15 Link Here

(-)./files/patch-eclipse-platform-parent (-16 / +7 lines)
5	'eclipiserun-repo' repository, such as for computing .api-descriptions and	5	'eclipiserun-repo' repository, such as for computing .api-descriptions and
6	generating API Tools reports.	6	generating API Tools reports.
7	-->	7	-->
8	- <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.11-I-builds/</eclipserun-repo>	8	- <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.12-I-builds/</eclipserun-repo>
9	+ <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.11/</eclipserun-repo>	9	+ <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.12/</eclipserun-repo>
10		10
11	- <comparator.repo>http://download.eclipse.org/eclipse/updates/4.11-I-builds</comparator.repo>	11	- <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12-I-builds</comparator.repo>
12	+ <comparator.repo>http://download.eclipse.org/eclipse/updates/4.11</comparator.repo>	12	+ <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12</comparator.repo>
13		13
14	<!--	14	<!--
15	NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.	15	NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
Lines 17-26 Link Here
17	it).	17	it).
18	And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable.	18	And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable.
19	-->	19	-->
20	- <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/</emf-repo.url>	20	- <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646</emf-repo.url>
21	+ <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/</emf-repo.url>	21	+ <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.18</emf-repo.url>
22		22
23	<ecf-repo.url>http://download.eclipse.org/rt/ecf/3.14.4/site.p2/</ecf-repo.url>	23	<ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.5/site.p2/</ecf-repo.url>
24		24
25	@@ -262,14 +262,14 @@	25	@@ -262,14 +262,14 @@
26	</target>	26	</target>
Lines 41-52 Link Here
41	</environment>	41	</environment>
42	<environment>	42	<environment>
43	<os>win32</os>	43	<os>win32</os>
44	@@ -639,7 +639,7 @@
45	For maintenance streams should always be "M-builds".
46	Ideally, this value would be provided by the environment, see bug 489789.
47	-->
48	- <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.11-I-builds</eclipse-p2-repo.url>
49	+ <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.11</eclipse-p2-repo.url>
50	</properties>
51	<repositories>
52	<repository>

Lines 98-119 Link Here

(-)./files/patch-eclipse.platform.releng.tychoeclipsebuilder (-10 / +8 lines)
98	org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip	98	org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
99	org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz	99	org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
100		100
101	-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.10-linux-gtk-x86_64.tar.gz	101	-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.11-linux-gtk-x86_64.tar.gz
102	+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-x86_64=\${basedir}/eclipse-platform-4.10-freebsd-gtk-amd64.tar.gz	102	+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz
103	org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.10-win32-x86_64.zip	103	org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.11-win32-x86_64.zip
104	org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.10-macosx-cocoa-x86_64.tar.gz	104	org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.11-macosx-cocoa-x86_64.tar.gz
105		105
106	diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	106	diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
107	--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000	107	--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000
108	+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000	108	+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000
109	@@ -7,10 +7,10 @@	109	@@ -8,9 +8,9 @@
110		110
111
112	mkdir -p workarea/${buildId}/eclipse-testing	111	mkdir -p workarea/${buildId}/eclipse-testing
113	-#cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/	112	#cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-SDK-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
114	-cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-platform-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/	113	-cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
115	+#cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/	114	+cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
116	+cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-platform-4.10-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
117		115
118	-cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/	116	-cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/
119	+cp ../../eclipse-SDK-${buildId}-freebsd-gtk-amd64.tar.gz workarea/${buildId}/eclipse-testing/	117	+cp ../../eclipse-SDK-${buildId}-freebsd-gtk-amd64.tar.gz workarea/${buildId}/eclipse-testing/

Lines 13-19 Link Here

(-)./files/patch-eclipse.platform.swt (-40 / +5 lines)
13	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	13	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
14	--- 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	14	--- 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
15	+++ 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	15	+++ 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
16	@@ -68,12 +68,12 @@	16	@@ -69,12 +69,12 @@
17	static String arch() {	17	static String arch() {
18	String osArch = System.getProperty("os.arch"); //$NON-NLS-1$	18	String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
19	if (osArch.equals ("i386") \|\| osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$	19	if (osArch.equals ("i386") \|\| osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
Lines 88-94 Link Here
88	"linux.x86")	88	"linux.x86")
89	if [ "${CC}" = "" ]; then	89	if [ "${CC}" = "" ]; then
90	export CC=gcc	90	export CC=gcc
91	@@ -194,7 +202,7 @@	91	@@ -194,7 +199,7 @@
92		92
93		93
94	# For 64-bit CPUs, we have a switch	94	# For 64-bit CPUs, we have a switch
Lines 97-103 Link Here
97	SWT_PTR_CFLAGS=-DJNI64	97	SWT_PTR_CFLAGS=-DJNI64
98	if [ -d /lib64 ]; then	98	if [ -d /lib64 ]; then
99	XLIB64=-L/usr/X11R6/lib64	99	XLIB64=-L/usr/X11R6/lib64
100	@@ -205,6 +213,11 @@	100	@@ -205,6 +210,11 @@
101	XLIB64="${XLIB64} -L/usr/lib64"	101	XLIB64="${XLIB64} -L/usr/lib64"
102	SWT_LFLAGS=-m64	102	SWT_LFLAGS=-m64
103	export SWT_LFLAGS	103	export SWT_LFLAGS
Lines 109-121 Link Here
109	fi	109	fi
110	export SWT_PTR_CFLAGS	110	export SWT_PTR_CFLAGS
111	fi	111	fi
112	@@ -364,4 +377,4 @@
113	elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
114	export GTK_VERSION="3.0"
115	func_build_gtk3 "$@"
116	-fi
117	\ No newline at end of file
118	+fi
119	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	112	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
120	--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000	113	--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000
121	+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000	114	+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000
Lines 185-204 Link Here
185	requires.5.range = [$version$,$version$]	178	requires.5.range = [$version$,$version$]
186	-requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))	179	-requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
187	+requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true)))	180	+requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true)))
188	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
189	--- eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml 0000-00-00 00:00:00.000000000 +0000
190	+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml 0000-00-00 00:00:00.000000000 +0000
191	@@ -237,8 +237,9 @@
192	<condition property="is64" value="true">
193	<or>
194	<equals arg1="${swt.arch}" arg2="x86_64"/>
195	+ <equals arg1="${swt.arch}" arg2="amd64"/>
196	<equals arg1="${swt.arch}" arg2="ia64"/>
197	- <equals arg1="${swt.arch}" arg2="ppc64le"/>
198	+ <equals arg1="${swt.arch}" arg2="powerpc64"/>
199	<equals arg1="${swt.arch}" arg2="s390x"/>
200	<equals arg1="${swt.arch}" arg2="sparcv9"/>
201	<equals arg1="${swt.arch}" arg2="aarch64"/>
202	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	181	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
203	--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000	182	--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000
204	+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000	183	+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000
Lines 231-237 Link Here
231	<filename regex="[0-9][0-9][0-9][0-9]."/>	210	<filename regex="[0-9][0-9][0-9][0-9]."/>
232	<filename regex="${swt_version}." negate="true"/>	211	<filename regex="${swt_version}." negate="true"/>
233	<exclude name="/.git/"/>	212	<exclude name="/.git/"/>
234	@@ -122,13 +122,13 @@	213	@@ -115,13 +115,13 @@
235	trust="true"	214	trust="true"
236	outputproperty="m_linux_x86_64_output"	215	outputproperty="m_linux_x86_64_output"
237	command="hostname"/>	216	command="hostname"/>
Lines 247-253 Link Here
247	command="hostname"/>	226	command="hostname"/>
248	<sshexec host="${m_mac}"	227	<sshexec host="${m_mac}"
249	username="swtbuild"	228	username="swtbuild"
250	@@ -152,10 +152,10 @@	229	@@ -139,10 +139,10 @@
251	<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/>	230	<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/>
252	</and>	231	</and>
253	</condition>	232	</condition>
Lines 261-280 Link Here
261	</and>	240	</and>
262	</condition>	241	</condition>
263	<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">	242	<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">
264	@@ -169,11 +169,11 @@
265	<echo></echo>
266	<echo>${m_linux_x86} - ${m_linux_x86_test}</echo>
267	<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>
268	- <echo>${m_linux_ppc64le} - ${m_linux_ppc64le_test}</echo>
269	+ <echo>${m_linux_powerpc64} - ${m_linux_powerpc64_test}</echo>
270	<echo>${m_mac} - ${m_mac_test}</echo>
271	<echo>-------------------------</echo>
272	<condition property="m_fail">
273	- <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/>
274	+ <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_powerpc64_test} ${m_mac_test}"/>
275	</condition>
276	<fail if="m_fail" message="Failed"/>
277	</target>
278	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup	243	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
279	--- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000	244	--- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000
280	+++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000	245	+++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000

Lines 83-89 Link Here

(-)./files/patch-eclipse.platform.swt.binaries (-144 / +4 lines)
83	Bundle-Vendor: %providerName	83	Bundle-Vendor: %providerName
84	-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true	84	-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
85	+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true	85	+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
86	Bundle-Version: 3.110.0.qualifier	86	Bundle-Version: 3.111.0.qualifier
87	Bundle-ManifestVersion: 2	87	Bundle-ManifestVersion: 2
88	Bundle-Localization: fragment	88	Bundle-Localization: fragment
89	@@ -26,8 +26,8 @@	89	@@ -26,8 +26,8 @@
Lines 141-147 Link Here
141	<groupId>org.eclipse.swt</groupId>	141	<groupId>org.eclipse.swt</groupId>
142	- <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>	142	- <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
143	+ <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>	143	+ <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
144	<version>3.110.0-SNAPSHOT</version>	144	<version>3.111.0-SNAPSHOT</version>
145	<packaging>eclipse-plugin</packaging>	145	<packaging>eclipse-plugin</packaging>
146		146
147	<properties>	147	<properties>
Lines 162-307 Link Here
162	</property>	162	</property>
163	</activation>	163	</activation>
164	<build>	164	<build>
165	diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF
166	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000
167	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000
168	@@ -2,7 +2,7 @@
169	Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
170	Bundle-Name: %fragmentName
171	Bundle-Vendor: %providerName
172	-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.arm; singleton:=true
173	+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.armv7; singleton:=true
174	Bundle-Version: 3.109.0.qualifier
175	Bundle-ManifestVersion: 2
176	Bundle-Localization: fragment
177	@@ -26,8 +26,8 @@
178	org.eclipse.swt.internal.cairo; x-internal:=true,
179	org.eclipse.swt.internal.gtk; x-internal:=true,
180	org.eclipse.swt.internal.opengl.glx; x-internal:=true
181	-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm))
182	+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=armv7))
183	SWT-WS: gtk
184	-SWT-OS: linux
185	-SWT-Arch: arm
186	-Automatic-Module-Name: org.eclipse.swt.gtk.linux.arm
187	+SWT-OS: freebsd
188	+SWT-Arch: armv7
189	+Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.armv7
190	diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml
191	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml 0000-00-00 00:00:00.000000000 +0000
192	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml 0000-00-00 00:00:00.000000000 +0000
193	@@ -1,9 +1,9 @@
194	<?xml version="1.0" encoding="UTF-8"?>
195	-<project name="org.eclipse.swt.gtk.linux.arm" default="build.jars" basedir=".">
196	+<project name="org.eclipse.swt.gtk.freebsd.armv7" default="build.jars" basedir=".">
197
198	<property name="swt.ws" value="gtk" />
199	- <property name="swt.os" value="linux" />
200	- <property name="swt.arch" value="arm" />
201	+ <property name="swt.os" value="freebsd" />
202	+ <property name="swt.arch" value="armv7" />
203	<property name="targets" value="install"/>
204
205	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
206	diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml
207	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000
208	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000
209	@@ -20,14 +20,14 @@
210	<relativePath>../binaries-parent/</relativePath>
211	</parent>
212	<groupId>org.eclipse.swt</groupId>
213	- <artifactId>org.eclipse.swt.gtk.linux.arm</artifactId>
214	+ <artifactId>org.eclipse.swt.gtk.freebsd.armv7</artifactId>
215	<version>3.109.0-SNAPSHOT</version>
216	<packaging>eclipse-plugin</packaging>
217
218	<properties>
219	- <os>linux</os>
220	+ <os>freebsd</os>
221	<ws>gtk</ws>
222	- <arch>arm</arch>
223	+ <arch>armv7</arch>
224	<buildid>${buildId}</buildid>
225	</properties>
226
227	@@ -61,7 +61,7 @@
228	<property>
229	<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
230	<name>native</name>
231	- <value>gtk.linux.arm</value>
232	+ <value>gtk.freebsd.armv7</value>
233	</property>
234	</activation>
235	<build>
236	diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF
237	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000
238	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000
239	@@ -2,7 +2,7 @@
240	Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
241	Bundle-Name: %fragmentName
242	Bundle-Vendor: %providerName
243	-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
244	+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.i386; singleton:=true
245	Bundle-Version: 3.109.0.qualifier
246	Bundle-ManifestVersion: 2
247	Bundle-Localization: fragment
248	@@ -26,7 +26,7 @@
249	org.eclipse.swt.internal.cairo; x-internal:=true,
250	org.eclipse.swt.internal.gtk; x-internal:=true,
251	org.eclipse.swt.internal.opengl.glx; x-internal:=true
252	-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
253	+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386))
254	SWT-WS: gtk
255	-SWT-OS: linux
256	-SWT-Arch: x86
257	+SWT-OS: freebsd
258	+SWT-Arch: i386
259	diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml
260	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml 0000-00-00 00:00:00.000000000 +0000
261	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml 0000-00-00 00:00:00.000000000 +0000
262	@@ -1,9 +1,9 @@
263	<?xml version="1.0" encoding="UTF-8"?>
264	-<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir=".">
265	+<project name="org.eclipse.swt.gtk.freebsd.i386" default="build.jars" basedir=".">
266
267	<property name="swt.ws" value="gtk" />
268	- <property name="swt.os" value="linux" />
269	- <property name="swt.arch" value="x86" />
270	+ <property name="swt.os" value="freebsd" />
271	+ <property name="swt.arch" value="i386" />
272	<property name="targets" value="install"/>
273
274	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
275	diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml
276	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000
277	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000
278	@@ -20,14 +20,14 @@
279	<relativePath>../binaries-parent/</relativePath>
280	</parent>
281	<groupId>org.eclipse.swt</groupId>
282	- <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
283	+ <artifactId>org.eclipse.swt.gtk.freebsd.i386</artifactId>
284	<version>3.109.0-SNAPSHOT</version>
285	<packaging>eclipse-plugin</packaging>
286
287	<properties>
288	- <os>linux</os>
289	+ <os>freebsd</os>
290	<ws>gtk</ws>
291	- <arch>x86</arch>
292	+ <arch>i386</arch>
293	<buildid>${buildId}</buildid>
294	</properties>
295
296	@@ -61,7 +61,7 @@
297	<property>
298	<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
299	<name>native</name>
300	- <value>gtk.linux.x86</value>
301	+ <value>gtk.freebsd.i386</value>
302	</property>
303	</activation>
304	<build>
305	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	165	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
306	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000	166	--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000
307	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000	167	+++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000
Lines 311-317 Link Here
311	Bundle-Vendor: %providerName	171	Bundle-Vendor: %providerName
312	-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true	172	-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
313	+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true	173	+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
314	Bundle-Version: 3.110.0.qualifier	174	Bundle-Version: 3.111.0.qualifier
315	Bundle-ManifestVersion: 2	175	Bundle-ManifestVersion: 2
316	Bundle-Localization: fragment	176	Bundle-Localization: fragment
317	@@ -26,8 +26,8 @@	177	@@ -26,8 +26,8 @@
Lines 352-358 Link Here
352	<groupId>org.eclipse.swt</groupId>	212	<groupId>org.eclipse.swt</groupId>
353	- <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>	213	- <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
354	+ <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>	214	+ <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
355	<version>3.110.0-SNAPSHOT</version>	215	<version>3.111.0-SNAPSHOT</version>
356	<packaging>eclipse-plugin</packaging>	216	<packaging>eclipse-plugin</packaging>
357		217
358	<properties>	218	<properties>

Lines 229-235 Link Here

(-)./files/patch-rt.equinox.framework (-6 / +6 lines)
229	private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$	229	private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$
230	private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$	230	private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$
231	private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$	231	private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$
232	@@ -734,7 +735,7 @@	232	@@ -746,7 +747,7 @@
233	// setup default values for known OSes if nothing was specified	233	// setup default values for known OSes if nothing was specified
234	if (osName.equals(Constants.OS_WIN32))	234	if (osName.equals(Constants.OS_WIN32))
235	return Constants.WS_WIN32;	235	return Constants.WS_WIN32;
Lines 238-244 Link Here
238	return Constants.WS_GTK;	238	return Constants.WS_GTK;
239	if (osName.equals(Constants.OS_MACOSX))	239	if (osName.equals(Constants.OS_MACOSX))
240	return Constants.WS_COCOA;	240	return Constants.WS_COCOA;
241	@@ -757,6 +758,8 @@	241	@@ -769,6 +770,8 @@
242	// EXCEPTION: All mappings of SunOS convert to Solaris	242	// EXCEPTION: All mappings of SunOS convert to Solaris
243	if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS))	243	if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS))
244	return Constants.OS_SOLARIS;	244	return Constants.OS_SOLARIS;
Lines 423-431 Link Here
423	diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	423	diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
424	--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000	424	--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000
425	+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000	425	+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000
426	@@ -127,8 +127,8 @@	426	@@ -123,8 +123,8 @@
427	<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">	427	<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
428	<fileset dir="${rt.equinox.binaries.loc}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/">	428	<fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/">
429	<include name="cocoa/macosx/x86_64/*/"/>	429	<include name="cocoa/macosx/x86_64/*/"/>
430	- <include name="gtk/linux/ppc64le/*/"/>	430	- <include name="gtk/linux/ppc64le/*/"/>
431	- <include name="gtk/linux/x86_64/*/"/>	431	- <include name="gtk/linux/x86_64/*/"/>
Lines 546-552 Link Here
546	diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml	546	diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml
547	--- rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000	547	--- rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000
548	+++ rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000	548	+++ rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000
549	@@ -50,27 +50,27 @@	549	@@ -54,27 +54,27 @@
550	</repositories>	550	</repositories>
551	</profile>	551	</profile>
552	<profile>	552	<profile>
Lines 580-586 Link Here
580	</modules>	580	</modules>
581	</profile>	581	</profile>
582	</profiles>	582	</profiles>
583	@@ -84,8 +84,8 @@	583	@@ -88,8 +88,8 @@
584		584
585	<module>bundles/org.eclipse.equinox.launcher</module>	585	<module>bundles/org.eclipse.equinox.launcher</module>
586	<module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>	586	<module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>

Lines 48-54 Link Here

(-)./files/patch-rt.equinox.p2 (-3 / +3 lines)
48	<plugin id="org.eclipse.core.runtime"/>	48	<plugin id="org.eclipse.core.runtime"/>
49	<plugin id="org.eclipse.e4.core.commands"/>	49	<plugin id="org.eclipse.e4.core.commands"/>
50	<plugin id="org.eclipse.e4.core.contexts"/>	50	<plugin id="org.eclipse.e4.core.contexts"/>
51	@@ -121,7 +121,7 @@	51	@@ -120,7 +120,7 @@
52	<plugin id="org.eclipse.equinox.preferences"/>	52	<plugin id="org.eclipse.equinox.preferences"/>
53	<plugin id="org.eclipse.equinox.registry"/>	53	<plugin id="org.eclipse.equinox.registry"/>
54	<plugin id="org.eclipse.equinox.security"/>	54	<plugin id="org.eclipse.equinox.security"/>
Lines 57-63 Link Here
57	<plugin id="org.eclipse.equinox.security.ui"/>	57	<plugin id="org.eclipse.equinox.security.ui"/>
58	<plugin id="org.eclipse.equinox.simpleconfigurator"/>	58	<plugin id="org.eclipse.equinox.simpleconfigurator"/>
59	<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>	59	<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
60	@@ -135,7 +135,7 @@	60	@@ -134,7 +134,7 @@
61	<plugin id="org.eclipse.osgi.util"/>	61	<plugin id="org.eclipse.osgi.util"/>
62	<plugin id="org.eclipse.swt"/>	62	<plugin id="org.eclipse.swt"/>
63	<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>	63	<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
Lines 81-87 Link Here
81	diff -ru rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml	81	diff -ru rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
82	--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000	82	--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000
83	+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000	83	+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000
84	@@ -185,9 +185,9 @@	84	@@ -184,9 +184,9 @@
85	unpack="false"/>	85	unpack="false"/>
86		86
87	<plugin	87	<plugin