Date: Tue, 20 Aug 2019 11:27:20 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509422 - in head/java/eclipse: . files Message-ID: <201908201127.x7KBRKsA035920@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue Aug 20 11:27:20 2019 New Revision: 509422 URL: https://svnweb.freebsd.org/changeset/ports/509422 Log: java/eclipse: upgrade 4.11 -> 4.12 - Fallback MASTER_SITES, as git.eclipse.org is slow/unreliable. PR: 239650 Submitted by: Jonathan Chen <jonc@chen.org.nz> (maintainer) Relnotes: https://www.eclipse.org/eclipseide/2019-06/noteworthy/ Modified: head/java/eclipse/Makefile head/java/eclipse/distinfo head/java/eclipse/files/patch-eclipse-platform-parent head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder head/java/eclipse/files/patch-eclipse.platform.runtime head/java/eclipse/files/patch-eclipse.platform.swt head/java/eclipse/files/patch-eclipse.platform.swt.binaries head/java/eclipse/files/patch-eclipse.platform.ui head/java/eclipse/files/patch-rt.equinox.framework head/java/eclipse/files/patch-rt.equinox.p2 head/java/eclipse/pkg-descr Modified: head/java/eclipse/Makefile ============================================================================== --- head/java/eclipse/Makefile Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/Makefile Tue Aug 20 11:27:20 2019 (r509422) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= eclipse -PORTVERSION= 4.11 -PORTREVISION= 1 +PORTVERSION= 4.12 CATEGORIES= java devel # Update to git-tag on git.eclipse.org -ECLIPSE_TAG= R4_11 -ECLIPSE_TSTAMP= 20190321-0023 +ECLIPSE_TAG= R4_12 +ECLIPSE_TSTAMP= 20190617-0403 ECLIPSE_SUFX= ${ECLIPSE_TAG}.tar.xz ECLIPSE_MODULES=jdt/eclipse.jdt \ @@ -38,14 +37,15 @@ 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} +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-03 +COMMENT= Eclipse IDE 2019-06 LICENSE= EPL @@ -62,8 +62,7 @@ USE_GITHUB= yes GH_ACCOUNT= daemonblade GH_PROJECT= eclipse-maven-repo -USE_JAVA= yes -JAVA_VERSION= 1.8 +USE_JAVA= 8 DESKTOP_ENTRIES="Eclipse" \ "${COMMENT}" \ @@ -74,7 +73,7 @@ DESKTOP_ENTRIES="Eclipse" \ SUB_FILES= ${PORTNAME} -MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} +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} Modified: head/java/eclipse/distinfo ============================================================================== --- head/java/eclipse/distinfo Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/distinfo Tue Aug 20 11:27:20 2019 (r509422) @@ -1,53 +1,53 @@ -TIMESTAMP = 1554503098 -SHA256 (eclipse/eclipse.jdt-R4_11.tar.xz) = 69cfb50655af18880880ef4292e2856ad12d847527553bb7d13f2a3443f566ce -SIZE (eclipse/eclipse.jdt-R4_11.tar.xz) = 37580 -SHA256 (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 903c7591a4698badbd279d09b2aefd3604820aba54cf2958e4fd5cfa0d806f24 -SIZE (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 8371984 -SHA256 (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = ddcf1962d1b869c22cc31d0634d280e68b91a6c8f5561f64a5072e558460e7a2 -SIZE (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = 34416600 -SHA256 (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 028222dbe3d2ebc4002b3b362e0500a791e86ef9e4fca9a5d7a1bed97f9bc395 -SIZE (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 1425276 -SHA256 (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 28ca01db7a12183125b9794cd56bb0dd6b5ba449014bc8bfe9ac6991e63b5a77 -SIZE (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 14117296 -SHA256 (eclipse/eclipse.pde.build-R4_11.tar.xz) = 32496ccf12e630762fd59fd18ebc1bae9f96437f012aaeab5797ba29f6b2ddd7 -SIZE (eclipse/eclipse.pde.build-R4_11.tar.xz) = 868176 -SHA256 (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 7ac38d3c2b52c030d7011395c94fe6dbdacc735a308911c1c0689388e54f6e87 -SIZE (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 29759352 -SHA256 (eclipse/eclipse.platform-R4_11.tar.xz) = f9512fc71c40c37703b89617efdbd48f1fac4d4558e705b9a13596a567241a5d -SIZE (eclipse/eclipse.platform-R4_11.tar.xz) = 952108 -SHA256 (eclipse/eclipse.platform.common-R4_11.tar.xz) = a3062ed00ebe342a98e1132449d42987e104b741e1b86201c456af47fdd004c3 -SIZE (eclipse/eclipse.platform.common-R4_11.tar.xz) = 34049880 -SHA256 (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 2e2b675035e808b121a9cb38cd5c26e35a6f2c38853f9dbd9db37d5e2ef1b921 -SIZE (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 1369408 -SHA256 (eclipse/eclipse.platform.releng-R4_11.tar.xz) = a550feae2316d591b0990460a053abc19dd87b80c86c351cce98bff33194ede9 -SIZE (eclipse/eclipse.platform.releng-R4_11.tar.xz) = 411064 -SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = c25d05c355585e5fcd6465a95899dd1eb6d2af92aab16d90bf0cdf3a6044c4fc -SIZE (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = 690924 -SHA256 (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 59be5020229e5053909194c55d416a384b2cf00b7a578d8df50d80c6bb8c6948 -SIZE (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 857244 -SHA256 (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 70b9ea7151ea5c60feea289f3a8b7fcd66619f46f2ef2fde0a7ae2a034355330 -SIZE (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 432764 -SHA256 (eclipse/eclipse.platform.swt-R4_11.tar.xz) = b779fe217ac503b28b83fa1104b17cd99e8b6086bdb31be3f9efbd2f4135bc96 -SIZE (eclipse/eclipse.platform.swt-R4_11.tar.xz) = 3535864 -SHA256 (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 805b830cb1cc45895594c1ac5fb96173a968fa954a33cb90dacf57215b651796 -SIZE (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 1077336 -SHA256 (eclipse/eclipse.platform.team-R4_11.tar.xz) = f4f36cb722f393e25626ea5131b4d9017f3d47d69f33f2982f7a6bdeda5b3dad -SIZE (eclipse/eclipse.platform.team-R4_11.tar.xz) = 4665536 -SHA256 (eclipse/eclipse.platform.text-R4_11.tar.xz) = da6fad72804338e40efa7572bf162e7f88dac8dc8a14eb2fe4f733ed47b0c6be -SIZE (eclipse/eclipse.platform.text-R4_11.tar.xz) = 1247548 -SHA256 (eclipse/eclipse.platform.ua-R4_11.tar.xz) = a879ef849eaf4585832bd8203f167a031c4f05c9916dc5138ed541eba4f0a870 -SIZE (eclipse/eclipse.platform.ua-R4_11.tar.xz) = 4438264 -SHA256 (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 00e5235b09106bd2f23c01257d50330ff2ed7511bb4dbdbbbe21929e2f25dc85 -SIZE (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 6013124 -SHA256 (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 4cc9941e49bb5f10b9155649165643e9afe5b758b2d3e0807c7c368797963b03 -SIZE (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 316036 -SHA256 (eclipse/rt.equinox.binaries-R4_11.tar.xz) = a4476629efbd4f5063ff42e0aebb9b75e0f40f667fa7a90152e6e1b14934e8f7 -SIZE (eclipse/rt.equinox.binaries-R4_11.tar.xz) = 623604 -SHA256 (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 4b1cada1dcb6b4cddd65f96a85740fcfe053722e836351f0e2ab53a54d531bc9 -SIZE (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 1139768 -SHA256 (eclipse/rt.equinox.framework-R4_11.tar.xz) = 39ea7af8cb7c56e6b4819902de00f498f881c6b66599d5a5b275f2bd32765480 -SIZE (eclipse/rt.equinox.framework-R4_11.tar.xz) = 2812036 -SHA256 (eclipse/rt.equinox.p2-R4_11.tar.xz) = 019ec06efb58a12417c0a1ae9ecfdc368ab8e4ad25364970bd112dc03b9a53c8 -SIZE (eclipse/rt.equinox.p2-R4_11.tar.xz) = 45251216 -SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = ab9e83997cccc02c235c8d3aa67db6f9963b25ede3d22d961d9292925a2f6bfa -SIZE (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = 167655977 +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 Modified: head/java/eclipse/files/patch-eclipse-platform-parent ============================================================================== --- head/java/eclipse/files/patch-eclipse-platform-parent Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-eclipse-platform-parent Tue Aug 20 11:27:20 2019 (r509422) @@ -5,11 +5,11 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platf 'eclipiserun-repo' repository, such as for computing .api-descriptions and generating API Tools reports. --> -- <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.11-I-builds/</eclipserun-repo>; -+ <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.11/</eclipserun-repo>; +- <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>http://download.eclipse.org/eclipse/updates/4.11-I-builds</comparator.repo>; -+ <comparator.repo>http://download.eclipse.org/eclipse/updates/4.11</comparator.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. @@ -17,10 +17,10 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platf it). And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable. --> -- <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/</emf-repo.url>; -+ <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/</emf-repo.url>; +- <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>http://download.eclipse.org/rt/ecf/3.14.4/site.p2/</ecf-repo.url>; + <ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.5/site.p2/</ecf-repo.url>; @@ -262,14 +262,14 @@ </target> @@ -41,12 +41,3 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platf </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> Modified: head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk ============================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk Tue Aug 20 11:27:20 2019 (r509422) @@ -2,11 +2,11 @@ diff -ru eclipse.platform.releng.prereqs.sdk/eclipse-s --- eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000 @@ -167,7 +167,7 @@ - <unit id="org.eclipse.emf.edit" version="2.14.0.v20180823-0456"/> + <unit id="org.eclipse.emf.edit" version="2.15.0.v20190528-0725"/> <unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/> - <unit id="org.eclipse.emf.databinding.edit" version="1.5.0.v20180823-0456"/> -- <repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/"/>; -+ <repository location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/"/>; + <unit id="org.eclipse.emf.databinding.edit" version="1.6.0.v20190323-1031"/> +- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646"/>; ++ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.18"/>; </location> <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit"> Modified: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder ============================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder Tue Aug 20 11:27:20 2019 (r509422) @@ -98,22 +98,20 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/e 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.10-linux-gtk-x86_64.tar.gz -+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-x86_64=\${basedir}/eclipse-platform-4.10-freebsd-gtk-amd64.tar.gz - org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.10-win32-x86_64.zip - org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.10-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 -@@ -7,10 +7,10 @@ +@@ -8,9 +8,9 @@ - mkdir -p workarea/${buildId}/eclipse-testing --#cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ --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/ -+#cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/ -+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 /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 ../../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/ Modified: head/java/eclipse/files/patch-eclipse.platform.runtime ============================================================================== --- head/java/eclipse/files/patch-eclipse.platform.runtime Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-eclipse.platform.runtime Tue Aug 20 11:27:20 2019 (r509422) @@ -1,7 +1,7 @@ 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 --- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000 -@@ -59,7 +59,7 @@ +@@ -63,7 +63,7 @@ //XXX This is not synchronized private Map<Bundle,Log> logs = new HashMap<>(5); Modified: head/java/eclipse/files/patch-eclipse.platform.swt ============================================================================== --- head/java/eclipse/files/patch-eclipse.platform.swt Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-eclipse.platform.swt Tue Aug 20 11:27:20 2019 (r509422) @@ -13,7 +13,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ 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 -@@ -68,12 +68,12 @@ +@@ -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$ @@ -88,7 +88,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ "linux.x86") if [ "${CC}" = "" ]; then export CC=gcc -@@ -194,7 +202,7 @@ +@@ -194,7 +199,7 @@ # For 64-bit CPUs, we have a switch @@ -97,7 +97,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then XLIB64=-L/usr/X11R6/lib64 -@@ -205,6 +213,11 @@ +@@ -205,6 +210,11 @@ XLIB64="${XLIB64} -L/usr/lib64" SWT_LFLAGS=-m64 export SWT_LFLAGS @@ -109,13 +109,6 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ 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 @@ -185,20 +178,6 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ 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 @@ -231,7 +210,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ <filename regex="[0-9][0-9][0-9][0-9]."/> <filename regex="${swt_version}." negate="true"/> <exclude name="**/.git/**"/> -@@ -122,13 +122,13 @@ +@@ -115,13 +115,13 @@ trust="true" outputproperty="m_linux_x86_64_output" command="hostname"/> @@ -247,7 +226,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ command="hostname"/> <sshexec host="${m_mac}" username="swtbuild" -@@ -152,10 +152,10 @@ +@@ -139,10 +139,10 @@ <matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/> </and> </condition> @@ -261,20 +240,6 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/ </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 Modified: head/java/eclipse/files/patch-eclipse.platform.swt.binaries ============================================================================== --- head/java/eclipse/files/patch-eclipse.platform.swt.binaries Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-eclipse.platform.swt.binaries Tue Aug 20 11:27:20 2019 (r509422) @@ -83,7 +83,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.ecl 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.110.0.qualifier + Bundle-Version: 3.111.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ @@ -141,7 +141,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.ecl <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> + <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId> - <version>3.110.0-SNAPSHOT</version> + <version>3.111.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> @@ -162,146 +162,6 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.ecl </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 @@ -311,7 +171,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.ecl 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.110.0.qualifier + Bundle-Version: 3.111.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ @@ -352,7 +212,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.ecl <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId> + <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId> - <version>3.110.0-SNAPSHOT</version> + <version>3.111.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> Modified: head/java/eclipse/files/patch-eclipse.platform.ui ============================================================================== --- head/java/eclipse/files/patch-eclipse.platform.ui Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-eclipse.platform.ui Tue Aug 20 11:27:20 2019 (r509422) @@ -61,8 +61,8 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.br 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 -@@ -206,7 +206,8 @@ - if (titleLabel.getVisible()) { +@@ -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)) { @@ -71,7 +71,7 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.fo tw += 1; // See Bug 342610 } if (bsize != null) -@@ -543,4 +544,4 @@ +@@ -584,4 +585,4 @@ target.setTransfer(transferTypes); target.addDropListener(listener); } Modified: head/java/eclipse/files/patch-rt.equinox.framework ============================================================================== --- head/java/eclipse/files/patch-rt.equinox.framework Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-rt.equinox.framework Tue Aug 20 11:27:20 2019 (r509422) @@ -229,7 +229,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.osgi 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$ -@@ -734,7 +735,7 @@ +@@ -746,7 +747,7 @@ // setup default values for known OSes if nothing was specified if (osName.equals(Constants.OS_WIN32)) return Constants.WS_WIN32; @@ -238,7 +238,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.osgi return Constants.WS_GTK; if (osName.equals(Constants.OS_MACOSX)) return Constants.WS_COCOA; -@@ -757,6 +758,8 @@ +@@ -769,6 +770,8 @@ // EXCEPTION: All mappings of SunOS convert to Solaris if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS)) return Constants.OS_SOLARIS; @@ -423,9 +423,9 @@ diff -ru rt.equinox.framework/features/org.eclipse.equ 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 -@@ -127,8 +127,8 @@ +@@ -123,8 +123,8 @@ <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true"> - <fileset dir="${rt.equinox.binaries.loc}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/"> + <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/**/*"/> @@ -546,7 +546,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equ 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 -@@ -50,27 +50,27 @@ +@@ -54,27 +54,27 @@ </repositories> </profile> <profile> @@ -580,7 +580,7 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.frame </modules> </profile> </profiles> -@@ -84,8 +84,8 @@ +@@ -88,8 +88,8 @@ <module>bundles/org.eclipse.equinox.launcher</module> <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module> Modified: head/java/eclipse/files/patch-rt.equinox.p2 ============================================================================== --- head/java/eclipse/files/patch-rt.equinox.p2 Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/files/patch-rt.equinox.p2 Tue Aug 20 11:27:20 2019 (r509422) @@ -48,7 +48,7 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2. <plugin id="org.eclipse.core.runtime"/> <plugin id="org.eclipse.e4.core.commands"/> <plugin id="org.eclipse.e4.core.contexts"/> -@@ -121,7 +121,7 @@ +@@ -120,7 +120,7 @@ <plugin id="org.eclipse.equinox.preferences"/> <plugin id="org.eclipse.equinox.registry"/> <plugin id="org.eclipse.equinox.security"/> @@ -57,7 +57,7 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2. <plugin id="org.eclipse.equinox.security.ui"/> <plugin id="org.eclipse.equinox.simpleconfigurator"/> <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/> -@@ -135,7 +135,7 @@ +@@ -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"/> @@ -81,7 +81,7 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2. 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 -@@ -185,9 +185,9 @@ +@@ -184,9 +184,9 @@ unpack="false"/> <plugin Modified: head/java/eclipse/pkg-descr ============================================================================== --- head/java/eclipse/pkg-descr Tue Aug 20 11:17:35 2019 (r509421) +++ head/java/eclipse/pkg-descr Tue Aug 20 11:27:20 2019 (r509422) @@ -5,4 +5,4 @@ development tools. The Eclipse Platform allows tool bu independently develop tools that integrate with other people's tools so seamlessly you can't tell where one tool ends and another starts. -WWW: http://www.eclipse.org/ +WWW: https://www.eclipse.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908201127.x7KBRKsA035920>