From a0c13b4a90b805807864f484d8ade07906198dbf Mon Sep 17 00:00:00 2001
From: Jonathan Chen <jonc@chen.org.nz>
Date: Fri, 3 Jun 2022 12:06:36 +0200
Subject: java/eclipse: update 4.16 -> 4.21

This release is 1.5 years overdue and 6 months out-of-date, but is
an important interim step to the 4.24 release due in June 2022.

Massive thanks go to Patrick Mackinlay who resolved the 2 critical
bugs preventing update from coming out sooner!

Author:	Jonathan Chen <jonc@chen.org.nz>
PR:	264400
---
 java/eclipse/files/patch-eclipse.platform.ui | 101 +++++++++++++++++----------
 1 file changed, 64 insertions(+), 37 deletions(-)

(limited to 'java/eclipse/files/patch-eclipse.platform.ui')

diff --git a/java/eclipse/files/patch-eclipse.platform.ui b/java/eclipse/files/patch-eclipse.platform.ui
index dc9b30dfed91..606d70f72a04 100644
--- a/java/eclipse/files/patch-eclipse.platform.ui
+++ b/java/eclipse/files/patch-eclipse.platform.ui
@@ -1,5 +1,6 @@
---- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	2021-03-08 20:18:47.351392000 +0100
+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
 @@ -33,9 +33,9 @@
            <resolver>p2</resolver>
            <environments>
@@ -12,8 +13,9 @@
              </environment>
            </environments>
          </configuration>
---- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	2021-03-08 20:18:47.351814000 +0100
+diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml
+--- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -94,7 +94,7 @@
        <browser
           id="org.eclipse.ui.browser.firefox"
@@ -56,9 +58,10 @@
           executable="epiphany">
           <location>
           	usr/bin/epiphany
---- eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java	2021-03-08 20:18:47.352410000 +0100
-@@ -210,7 +210,8 @@
+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
+@@ -209,7 +209,8 @@
  				if (currentTitleControl.getVisible()) {
  					int tw = width - HMARGIN * 2 - SPACING * 2;
  					String os = System.getProperty("os.name"); //$NON-NLS-1$
@@ -68,15 +71,16 @@
  						tw += 1; // See Bug 342610
  					}
  					if (bsize != null)
-@@ -584,4 +585,4 @@
+@@ -577,4 +578,4 @@
  		target.setTransfer(transferTypes);
  		target.addDropListener(listener);
  	}
 -}
 \ No newline at end of file
 +}
---- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml	2021-03-08 20:18:47.352793000 +0100
+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,7 +12,7 @@
          basestylesheeturi="css/e4-dark_linux.css"
          id="org.eclipse.e4.ui.css.theme.e4_dark"
@@ -95,8 +99,9 @@
        </theme>
        <theme
              basestylesheeturi="css/e4_default_mac.css"
---- eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	2021-03-08 20:18:47.353114000 +0100
+diff -ru eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java
+--- eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	0000-00-00 00:00:00.000000000 +0000
 @@ -33,6 +33,8 @@
  	 * @return an instance of IOperatingSystemRegistration
  	 */
@@ -106,9 +111,10 @@
  		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
  			return new RegistrationMacOsX();
  		} else if (Platform.OS_LINUX.equals(Platform.getOS())) {
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2021-03-08 20:55:41.125354000 +0100
-@@ -403,26 +403,36 @@
+diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -406,19 +406,29 @@
           fragment="true"/>
  
     <plugin
@@ -125,33 +131,39 @@
           fragment="true"/>
  
     <plugin
--         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
+-         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
 -         os="linux"
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le"
 +         os="freebsd"
           ws="gtk"
--         arch="x86_64"
 +         arch="powerpc64le"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64"
++         os="freebsd"
++         ws="gtk"
+          arch="aarch64"
           download-size="0"
           install-size="0"
-          version="0.0.0"
+@@ -426,10 +436,10 @@
           fragment="true"/>
  
     <plugin
+-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
+-         os="linux"
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
 +         os="freebsd"
-+         ws="gtk"
+          ws="gtk"
+-         arch="x86_64"
 +         arch="amd64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.launcher.win32.win32.x86_64"
-          os="win32"
-          ws="win32"
-@@ -451,10 +461,10 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+@@ -464,10 +474,10 @@
           unpack="false"/>
  
     <plugin
@@ -165,16 +177,15 @@
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -462,10 +472,21 @@
+@@ -475,9 +485,20 @@
           unpack="false"/>
  
     <plugin
--         id="org.eclipse.swt.gtk.linux.x86_64"
+-         id="org.eclipse.swt.gtk.linux.aarch64"
 -         os="linux"
 +         id="org.eclipse.swt.gtk.freebsd.powerpc64le"
 +         os="freebsd"
           ws="gtk"
--         arch="x86_64"
 +         arch="powerpc64le"
 +         download-size="0"
 +         install-size="0"
@@ -183,23 +194,39 @@
 +         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.swt.gtk.freebsd.amd64"
++         id="org.eclipse.swt.gtk.freebsd.aarch64"
 +         os="freebsd"
 +         ws="gtk"
+          arch="aarch64"
+          download-size="0"
+          install-size="0"
+@@ -486,10 +507,10 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.swt.gtk.linux.x86_64"
+-         os="linux"
++         id="org.eclipse.swt.gtk.freebsd.amd64"
++         os="freebsd"
+          ws="gtk"
+-         arch="x86_64"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig	2020-06-03 13:17:27.000000000 +0200
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2021-03-08 20:56:25.872460000 +0100
-@@ -39,8 +39,9 @@
-                 <plugin id="javax.xml"/>
+diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -39,9 +39,10 @@
                  <plugin id="org.eclipse.swt"/>
                  <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
+                 <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.aarch64"/>
 -                <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/>
+-                <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64"/>
 -                <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le"/>
++                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.aarch64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"/>
                  <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
                </excludes>
-- 
cgit v1.2.3