From ec45db21d54b46f0465611d418736dfe4d104dec Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Thu, 2 Jan 2020 11:19:08 +0000 Subject: java/eclipse: upgrade 4.12 -> 4.14 PR: 243017 Submitted by: Jonathan Chen (maintainer) Relnotes: https://www.eclipse.org/eclipseide/2019-12/noteworthy/ --- java/eclipse/files/patch-eclipse-platform-parent | 25 +-- java/eclipse/files/patch-eclipse.pde.ui | 2 +- java/eclipse/files/patch-eclipse.platform.releng | 6 +- .../patch-eclipse.platform.releng.prereqs.sdk | 12 -- ...tch-eclipse.platform.releng.tychoeclipsebuilder | 50 ++--- .../eclipse/files/patch-eclipse.platform.resources | 69 +------ java/eclipse/files/patch-eclipse.platform.runtime | 2 +- java/eclipse/files/patch-eclipse.platform.swt | 16 +- .../files/patch-eclipse.platform.swt.binaries | 8 +- java/eclipse/files/patch-eclipse.platform.team | 10 +- java/eclipse/files/patch-eclipse.platform.text | 12 ++ java/eclipse/files/patch-eclipse.platform.ua | 6 +- java/eclipse/files/patch-eclipse.platform.ui | 32 ++- java/eclipse/files/patch-rt.equinox.bundles | 34 ++- java/eclipse/files/patch-rt.equinox.framework | 228 +++------------------ java/eclipse/files/patch-rt.equinox.p2 | 2 +- 16 files changed, 133 insertions(+), 381 deletions(-) delete mode 100644 java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk create mode 100644 java/eclipse/files/patch-eclipse.platform.text (limited to 'java/eclipse/files') diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent index cd15089c0366..84e0e67d321c 100644 --- a/java/eclipse/files/patch-eclipse-platform-parent +++ b/java/eclipse/files/patch-eclipse-platform-parent @@ -5,24 +5,15 @@ 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. --> -- https://download.eclipse.org/eclipse/updates/4.12-I-builds/ -+ https://download.eclipse.org/eclipse/updates/4.12/ +- https://download.eclipse.org/eclipse/updates/4.14-I-builds/ ++ https://download.eclipse.org/eclipse/updates/4.14/ -- https://download.eclipse.org/eclipse/updates/4.12-I-builds -+ https://download.eclipse.org/eclipse/updates/4.12 +- https://download.eclipse.org/eclipse/updates/4.14-I-builds ++ https://download.eclipse.org/eclipse/updates/4.14 -- https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646 -+ https://download.eclipse.org/modeling/emf/emf/builds/release/2.18 - - https://download.eclipse.org/rt/ecf/3.14.5/site.p2/ - -@@ -262,14 +262,14 @@ +@@ -263,14 +263,14 @@ @@ -41,12 +32,12 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml win32 -@@ -657,7 +657,7 @@ +@@ -635,7 +635,7 @@ For maintenance streams should always be "M-builds". Ideally, this value would be provided by the environment, see bug 489789. --> -- https://download.eclipse.org/eclipse/updates/4.12-I-builds -+ https://download.eclipse.org/eclipse/updates/4.12 +- https://download.eclipse.org/eclipse/updates/4.14-I-builds ++ https://download.eclipse.org/eclipse/updates/4.14 diff --git a/java/eclipse/files/patch-eclipse.pde.ui b/java/eclipse/files/patch-eclipse.pde.ui index 4b014c61cb48..89a9278f1b7c 100644 --- a/java/eclipse/files/patch-eclipse.pde.ui +++ b/java/eclipse/files/patch-eclipse.pde.ui @@ -1,7 +1,7 @@ diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product --- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 -@@ -80,8 +80,8 @@ +@@ -81,8 +81,8 @@ diff --git a/java/eclipse/files/patch-eclipse.platform.releng b/java/eclipse/files/patch-eclipse.platform.releng index 312da382e146..ac582eb15b46 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng +++ b/java/eclipse/files/patch-eclipse.platform.releng @@ -14,7 +14,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x download-size="0" install-size="0" version="0.0.0" -@@ -348,9 +348,9 @@ +@@ -355,9 +355,9 @@ unpack="false"/> - - -- -+ - - - diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder index b571f921ee15..c55c2ef70d6d 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder +++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder @@ -8,9 +8,9 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTo - value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" /> + value="eclipse-platform-${eclispeBaseLabel}-freebsd-gtk-amd64.tar.gz" /> - native @@ -88,7 +88,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. -@@ -63,10 +63,10 @@ +@@ -67,10 +67,10 @@ process-resources @@ -99,67 +99,6 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. + + + -+ - - - -diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF ---- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -1,9 +1,9 @@ - Manifest-Version: 1.0 - Bundle-ManifestVersion: 2 - Bundle-Name: %fragmentName --Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true -+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.i386; singleton:=true - Bundle-Version: 1.4.300.qualifier - Bundle-Vendor: %providerName - Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.7.200,2.0.0)" - Bundle-Localization: fragment --Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) -+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=i386)) -diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml ---- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,7 +18,7 @@ - ../../ - - org.eclipse.core -- org.eclipse.core.filesystem.linux.x86 -+ org.eclipse.core.filesystem.freebsd.i386 - 1.4.300-SNAPSHOT - eclipse-plugin - -@@ -33,9 +33,9 @@ - p2 - - -- linux -+ freebsd - gtk -- x86 -+ i386 - - - -@@ -50,7 +50,7 @@ - - - native -- gtk.linux.x86 -+ gtk.freebsd.i386 - - - -@@ -63,9 +63,9 @@ - process-resources - - -- -- -- -+ -+ + @@ -191,7 +130,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd. 1.4.100-SNAPSHOT eclipse-plugin -@@ -33,9 +33,9 @@ +@@ -37,9 +37,9 @@ p2 diff --git a/java/eclipse/files/patch-eclipse.platform.runtime b/java/eclipse/files/patch-eclipse.platform.runtime index 30bde8b30bac..ef7a0a27c589 100644 --- a/java/eclipse/files/patch-eclipse.platform.runtime +++ b/java/eclipse/files/patch-eclipse.platform.runtime @@ -13,7 +13,7 @@ diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclip diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java --- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 0000-00-00 00:00:00.000000000 +0000 -@@ -207,6 +207,8 @@ +@@ -208,6 +208,8 @@ */ public static final String OS_LINUX = "linux";//$NON-NLS-1$ diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt index c71e4f916b59..84a9befe8d4c 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt +++ b/java/eclipse/files/patch-eclipse.platform.swt @@ -10,6 +10,18 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk eclipse.pla +diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 +@@ -10,7 +10,7 @@ + * + * Contributors: + * IBM Corporation - initial API and implementation +- * Pierre-Yves B., pyvesdev@gmail.com - Bug 219750: [styled text] Typing ~~ inserts é~~ ++ * Pierre-Yves B., pyvesdev@gmail.com - Bug 219750 + *******************************************************************************/ + package org.eclipse.swt.widgets; + diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 @@ -148,7 +160,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000 -@@ -58,8 +58,8 @@ +@@ -60,8 +60,8 @@ /* Initialize the OS flags and locale constants */ String osName = System.getProperty ("os.name"); @@ -162,7 +174,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 -@@ -155,7 +155,7 @@ +@@ -157,7 +157,7 @@ * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/ * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript */ diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries index bb8d79f69166..f42af3ca37b7 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.111.0.qualifier + Bundle-Version: 3.113.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.111.0-SNAPSHOT + 3.113.0-SNAPSHOT eclipse-plugin @@ -171,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.111.0.qualifier + Bundle-Version: 3.113.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ @@ -212,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.111.0-SNAPSHOT + 3.113.0-SNAPSHOT eclipse-plugin diff --git a/java/eclipse/files/patch-eclipse.platform.team b/java/eclipse/files/patch-eclipse.platform.team index 2786856d7d98..059f21aedb62 100644 --- a/java/eclipse/files/patch-eclipse.platform.team +++ b/java/eclipse/files/patch-eclipse.platform.team @@ -68,7 +68,7 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-I Bundle-Localization: fragment -Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true +Bundle-SymbolicName: org.eclipse.core.net.freebsd.amd64;singleton:=true - Bundle-Version: 1.2.300.qualifier + Bundle-Version: 1.2.400.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) @@ -84,10 +84,10 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xm org.eclipse.core - org.eclipse.core.net.linux.x86_64 + org.eclipse.core.net.freebsd.amd64 - 1.2.300-SNAPSHOT + 1.2.400-SNAPSHOT eclipse-plugin -@@ -30,9 +30,9 @@ +@@ -34,9 +34,9 @@ @@ -99,7 +99,7 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xm -@@ -47,7 +47,7 @@ +@@ -51,7 +51,7 @@ native @@ -108,7 +108,7 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xm -@@ -60,9 +60,9 @@ +@@ -64,9 +64,9 @@ process-resources diff --git a/java/eclipse/files/patch-eclipse.platform.text b/java/eclipse/files/patch-eclipse.platform.text new file mode 100644 index 000000000000..ee23d19bf2d3 --- /dev/null +++ b/java/eclipse/files/patch-eclipse.platform.text @@ -0,0 +1,12 @@ +diff -ru eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml +--- eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -1298,7 +1298,7 @@ + %blockSelectionModeFont.description + + + diff --git a/java/eclipse/files/patch-eclipse.platform.ua b/java/eclipse/files/patch-eclipse.platform.ua index d9d97c609d16..8254318a47c3 100644 --- a/java/eclipse/files/patch-eclipse.platform.ua +++ b/java/eclipse/files/patch-eclipse.platform.ua @@ -35,15 +35,15 @@ diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal prefs .put("custom_browser_path", //$NON-NLS-1$ "\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$ -- } else if (os.indexOf("linux") != -1) { //$NON-NLS-1$ -+ } else if (os.indexOf("linux") != -1 || os.indexOf("freebsd") != -1) { //$NON-NLS-1$ +- } else if (os.contains("linux")) { //$NON-NLS-1$ ++ } else if (os.contains("linux") || os.contains("freebsd")) { //$NON-NLS-1$ prefs.put("custom_browser_path", //$NON-NLS-1$ "konqueror %1"); //$NON-NLS-1$ } else { diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java 0000-00-00 00:00:00.000000000 +0000 -@@ -103,6 +103,7 @@ +@@ -102,6 +102,7 @@ setDefaultBrowserID(BROWSER_ID_SYSTEM); } else if (Constants.OS_AIX.equalsIgnoreCase(os) || (Constants.OS_HPUX.equalsIgnoreCase(os)) diff --git a/java/eclipse/files/patch-eclipse.platform.ui b/java/eclipse/files/patch-eclipse.platform.ui index 1b3c00e0ba93..86999a4aefdd 100644 --- a/java/eclipse/files/patch-eclipse.platform.ui +++ b/java/eclipse/files/patch-eclipse.platform.ui @@ -1,7 +1,7 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml --- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -32,9 +32,9 @@ +@@ -37,9 +37,9 @@ p2 @@ -81,32 +81,24 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/int diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml --- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -12,6 +12,12 @@ - basestylesheeturi="css/e4-dark.css" +@@ -12,7 +12,7 @@ + basestylesheeturi="css/e4-dark_linux.css" id="org.eclipse.e4.ui.css.theme.e4_dark" label="%theme.dark" +- os="linux"> + os="freebsd"> -+ -+ - -+ -+ - ++ os="freebsd"> + + org.eclipse.equinox - org.eclipse.equinox.security.linux.x86_64 + org.eclipse.equinox.security.freebsd.amd64 - 1.1.200-SNAPSHOT + 1.1.300-SNAPSHOT eclipse-plugin -@@ -31,9 +31,9 @@ +@@ -35,9 +35,9 @@ p2 @@ -91,7 +87,7 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/p -@@ -47,7 +47,7 @@ +@@ -51,7 +51,7 @@ native @@ -100,7 +96,7 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/p -@@ -60,7 +60,7 @@ +@@ -64,7 +64,7 @@ process-resources @@ -166,7 +162,7 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt diff -ru rt.equinox.bundles/pom.xml rt.equinox.bundles/pom.xml --- rt.equinox.bundles/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -90,7 +90,7 @@ +@@ -89,7 +89,7 @@ bundles/org.eclipse.equinox.security bundles/org.eclipse.equinox.security.macosx bundles/org.eclipse.equinox.security.win32.x86_64 diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework index 56716e64db33..eaeb865b26ae 100644 --- a/java/eclipse/files/patch-rt.equinox.framework +++ b/java/eclipse/files/patch-rt.equinox.framework @@ -7,7 +7,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true - Bundle-Version: 1.1.1000.qualifier + Bundle-Version: 1.1.1100.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) -Bundle-Localization: launcher.gtk.linux.aarch64 @@ -23,7 +23,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.aarch64 + org.eclipse.equinox.launcher.gtk.freebsd.aarch64 - 1.1.1000-SNAPSHOT + 1.1.1100-SNAPSHOT eclipse-plugin @@ -31,7 +31,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a + freebsd gtk aarch64 - + true diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 @@ -52,7 +52,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true - Bundle-Version: 1.1.1000.qualifier + Bundle-Version: 1.1.1100.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) -Bundle-Localization: launcher.gtk.linux.x86_64 @@ -72,13 +72,13 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,13 +18,13 @@ +@@ -18,14 +18,14 @@ ../../launcher-binary-parent org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.x86_64 + org.eclipse.equinox.launcher.gtk.freebsd.amd64 - 1.1.1000-SNAPSHOT + 1.1.1100-SNAPSHOT eclipse-plugin @@ -87,88 +87,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a gtk - x86_64 + amd64 - - -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -2,9 +2,9 @@ - Bundle-ManifestVersion: 2 - Bundle-Name: %pluginName - Bundle-Vendor: %providerName --Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.arm;singleton:=true -+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.armv7;singleton:=true - Bundle-Version: 1.1.1000.qualifier - Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" --Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm)) --Bundle-Localization: launcher.gtk.linux.arm -+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=armv7)) -+Bundle-Localization: launcher.gtk.freebsd.armv7 - Eclipse-BundleShape: dir -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,13 +18,13 @@ - ../../launcher-binary-parent - - org.eclipse.equinox -- org.eclipse.equinox.launcher.gtk.linux.arm -+ org.eclipse.equinox.launcher.gtk.freebsd.armv7 - 1.1.1000-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk -- arm -+ armv7 - - -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -2,9 +2,9 @@ - Bundle-ManifestVersion: 2 - Bundle-Name: %pluginName - Bundle-Vendor: %providerName --Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true -+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.i386;singleton:=true - Bundle-Version: 1.1.1000.qualifier - Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" --Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) --Bundle-Localization: launcher.gtk.linux.x86 -+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386)) -+Bundle-Localization: launcher.gtk.freebsd.i386 - Eclipse-BundleShape: dir -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties 0000-00-00 00:00:00.000000000 +0000 -@@ -11,5 +11,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --pluginName = Equinox Launcher Linux X86 Fragment -+pluginName = Equinox Launcher FreeBSD/i386 Fragment - providerName = Eclipse.org - Equinox -diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml ---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,13 +18,13 @@ - ../../launcher-binary-parent - - org.eclipse.equinox -- org.eclipse.equinox.launcher.gtk.linux.x86 -+ org.eclipse.equinox.launcher.gtk.freebsd.i386 - 1.1.1000-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk -- x86 -+ i386 + true diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project @@ -191,7 +110,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 1.1.1000.qualifier + Bundle-Version: 1.1.1100.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) -Bundle-Localization: launcher.gtk.linux.ppc64le @@ -201,13 +120,13 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,13 +18,13 @@ +@@ -18,14 +18,14 @@ ../../launcher-binary-parent org.eclipse.equinox - org.eclipse.equinox.launcher.gtk.linux.ppc64le + org.eclipse.equinox.launcher.gtk.freebsd.powerpc64 - 1.1.1000-SNAPSHOT + 1.1.1100-SNAPSHOT eclipse-plugin @@ -216,65 +135,9 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p gtk - ppc64le + powerpc64 + true -diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java ---- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 0000-00-00 00:00:00.000000000 +0000 -@@ -78,6 +78,7 @@ - // this internally to be Solaris. - private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ - private static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$ -+ private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ - 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; -- if (osName.equals(Constants.OS_LINUX)) -+ if (osName.equals(Constants.OS_LINUX) || osName.equals(Constants.OS_FREEBSD)) - 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; -+ if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD)) -+ return Constants.OS_FREEBSD; - if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX)) - return Constants.OS_LINUX; - if (osName.equalsIgnoreCase(INTERNAL_OS_QNX)) -diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java ---- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java 0000-00-00 00:00:00.000000000 +0000 -@@ -80,7 +80,7 @@ - - if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ -- if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ -+ if (osName.startsWith("freebsd") || osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - IS_PROCESSING_NEEDED = true; - } - } -diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java ---- rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 0000-00-00 00:00:00.000000000 +0000 -@@ -26,6 +26,12 @@ - //TODO These constants need to be aligned with the OSGi ones. See page 64-588 of the spec - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * FreeBSD-based operating system. -+ */ -+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ -+ -+ /** - * Constant string (value "win32") indicating the platform is running on a - * Window 32-bit operating system (e.g., Windows 98, NT, 2000). - */ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 @@ -297,7 +160,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bu diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -32,20 +32,20 @@ +@@ -33,20 +33,20 @@ fragment="true"/> -- -- -- -- -+ -+ -+ -+ - - -- -+ - - - -@@ -134,37 +134,37 @@ - - - - - - @@ -493,24 +326,11 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re - + -- -- -- -- -+ -+ -+ -+ - - -- -+ - -- +- - - - -+ ++ + + + @@ -534,15 +354,17 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re -@@ -212,7 +212,7 @@ +@@ -138,8 +138,8 @@ - -+ - +- ++ ++ + 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 diff --git a/java/eclipse/files/patch-rt.equinox.p2 b/java/eclipse/files/patch-rt.equinox.p2 index 43f9df4a1a06..1296e31876f5 100644 --- a/java/eclipse/files/patch-rt.equinox.p2 +++ b/java/eclipse/files/patch-rt.equinox.p2 @@ -57,7 +57,7 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/r -@@ -134,7 +134,7 @@ +@@ -133,7 +133,7 @@ -- cgit v1.2.3