From 02d28e745c763f190e0175e5d5324214e9be5e5e Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Tue, 20 Aug 2019 11:27:20 +0000 Subject: java/eclipse: upgrade 4.11 -> 4.12 - Fallback MASTER_SITES, as git.eclipse.org is slow/unreliable. PR: 239650 Submitted by: Jonathan Chen (maintainer) Relnotes: https://www.eclipse.org/eclipseide/2019-06/noteworthy/ --- java/eclipse/files/patch-eclipse-platform-parent | 23 +--- .../patch-eclipse.platform.releng.prereqs.sdk | 8 +- ...tch-eclipse.platform.releng.tychoeclipsebuilder | 18 ++- java/eclipse/files/patch-eclipse.platform.runtime | 2 +- java/eclipse/files/patch-eclipse.platform.swt | 45 +------ .../files/patch-eclipse.platform.swt.binaries | 148 +-------------------- java/eclipse/files/patch-eclipse.platform.ui | 6 +- java/eclipse/files/patch-rt.equinox.framework | 12 +- java/eclipse/files/patch-rt.equinox.p2 | 6 +- 9 files changed, 41 insertions(+), 227 deletions(-) (limited to 'java/eclipse/files') diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent index 76753df29356..d37c87c9a025 100644 --- a/java/eclipse/files/patch-eclipse-platform-parent +++ b/java/eclipse/files/patch-eclipse-platform-parent @@ -5,11 +5,11 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml 'eclipiserun-repo' repository, such as for computing .api-descriptions and generating API Tools reports. --> -- http://download.eclipse.org/eclipse/updates/4.11-I-builds/ -+ http://download.eclipse.org/eclipse/updates/4.11/ +- https://download.eclipse.org/eclipse/updates/4.12-I-builds/ ++ https://download.eclipse.org/eclipse/updates/4.12/ -- http://download.eclipse.org/eclipse/updates/4.11-I-builds -+ http://download.eclipse.org/eclipse/updates/4.11 +- https://download.eclipse.org/eclipse/updates/4.12-I-builds ++ https://download.eclipse.org/eclipse/updates/4.12 -- http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/ -+ http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/ +- https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646 ++ https://download.eclipse.org/modeling/emf/emf/builds/release/2.18 - http://download.eclipse.org/rt/ecf/3.14.4/site.p2/ + https://download.eclipse.org/rt/ecf/3.14.5/site.p2/ @@ -262,14 +262,14 @@ @@ -41,12 +41,3 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml win32 -@@ -639,7 +639,7 @@ - For maintenance streams should always be "M-builds". - Ideally, this value would be provided by the environment, see bug 489789. - --> -- http://download.eclipse.org/eclipse/updates/4.11-I-builds -+ http://download.eclipse.org/eclipse/updates/4.11 - - - diff --git a/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk b/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk index 1e8eb071b8a5..c12474c134f2 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk +++ b/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk @@ -2,11 +2,11 @@ diff -ru eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target eclipse. --- 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 @@ - + - -- -+ + +- ++ diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder index a385cb2e16f1..b571f921ee15 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder +++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder @@ -98,22 +98,20 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/mai 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/ diff --git a/java/eclipse/files/patch-eclipse.platform.runtime b/java/eclipse/files/patch-eclipse.platform.runtime index 8b2b3961ca78..30bde8b30bac 100644 --- a/java/eclipse/files/patch-eclipse.platform.runtime +++ b/java/eclipse/files/patch-eclipse.platform.runtime @@ -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 logs = new HashMap<>(5); diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt index d02a24c7f451..8d57e331eed0 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt +++ b/java/eclipse/files/patch-eclipse.platform.swt @@ -13,7 +13,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk eclipse.pla 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/Eclipse SWT PI/gtk/library "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/Eclipse SWT PI/gtk/library 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/Eclipse SWT PI/gtk/library 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/META-INF/p2.inf eclipse.pl requires.5.range = [$version$,$version$] -requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) +requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true))) -diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/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 @@ - - - -+ - -- -+ - - - 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/buildSWT.xml eclipse.platf -@@ -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/buildSWT.xml eclipse.platf command="hostname"/> @@ -261,20 +240,6 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platf -@@ -169,11 +169,11 @@ - - ${m_linux_x86} - ${m_linux_x86_test} - ${m_linux_x86_64} - ${m_linux_x86_64_test} -- ${m_linux_ppc64le} - ${m_linux_ppc64le_test} -+ ${m_linux_powerpc64} - ${m_linux_powerpc64_test} - ${m_mac} - ${m_mac_test} - ------------------------- - -- -+ - - - 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 diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries index 13e005e9cbf0..bb8d79f69166 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt.binaries +++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries @@ -83,7 +83,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true - Bundle-Version: 3.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.eclipse.swt.gtk.freebsd.amd64 org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 + org.eclipse.swt.gtk.freebsd.amd64 - 3.110.0-SNAPSHOT + 3.111.0-SNAPSHOT eclipse-plugin @@ -162,146 +162,6 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 -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 @@ - -- -+ - - -- -- -+ -+ - - - -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 @@ - ../binaries-parent/ - - org.eclipse.swt -- org.eclipse.swt.gtk.linux.arm -+ org.eclipse.swt.gtk.freebsd.armv7 - 3.109.0-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk -- arm -+ armv7 - ${buildId} - - -@@ -61,7 +61,7 @@ - - - native -- gtk.linux.arm -+ gtk.freebsd.armv7 - - - -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 @@ - -- -+ - - -- -- -+ -+ - - - -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 @@ - ../binaries-parent/ - - org.eclipse.swt -- org.eclipse.swt.gtk.linux.x86 -+ org.eclipse.swt.gtk.freebsd.i386 - 3.109.0-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk -- x86 -+ i386 - ${buildId} - - -@@ -61,7 +61,7 @@ - - - native -- gtk.linux.x86 -+ gtk.freebsd.i386 - - - 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.eclipse.swt.gtk.freebsd.power Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 3.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.eclipse.swt.gtk.freebsd.power org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc64le + org.eclipse.swt.gtk.freebsd.powerpc64 - 3.110.0-SNAPSHOT + 3.111.0-SNAPSHOT eclipse-plugin diff --git a/java/eclipse/files/patch-eclipse.platform.ui b/java/eclipse/files/patch-eclipse.platform.ui index 3c65c0416817..1b3c00e0ba93 100644 --- a/java/eclipse/files/patch-eclipse.platform.ui +++ b/java/eclipse/files/patch-eclipse.platform.ui @@ -61,8 +61,8 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml eclipse.p 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.forms/src/org/eclipse/ui/int tw += 1; // See Bug 342610 } if (bsize != null) -@@ -543,4 +544,4 @@ +@@ -584,4 +585,4 @@ target.setTransfer(transferTypes); target.addDropListener(listener); } diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework index b7d980910105..56716e64db33 100644 --- a/java/eclipse/files/patch-rt.equinox.framework +++ b/java/eclipse/files/patch-rt.equinox.framework @@ -229,7 +229,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse 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/container/src/org/eclipse 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.equinox.executable.feature/li 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 @@ - + - - @@ -546,7 +546,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re 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 @@ @@ -580,7 +580,7 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml -@@ -84,8 +84,8 @@ +@@ -88,8 +88,8 @@ bundles/org.eclipse.equinox.launcher bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64 diff --git a/java/eclipse/files/patch-rt.equinox.p2 b/java/eclipse/files/patch-rt.equinox.p2 index 2b64e693602c..43f9df4a1a06 100644 --- a/java/eclipse/files/patch-rt.equinox.p2 +++ b/java/eclipse/files/patch-rt.equinox.p2 @@ -48,7 +48,7 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r -@@ -121,7 +121,7 @@ +@@ -120,7 +120,7 @@ @@ -57,7 +57,7 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r -@@ -135,7 +135,7 @@ +@@ -134,7 +134,7 @@ @@ -81,7 +81,7 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.l 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"/>