ports/java/eclipse/files/patch-eclipse.platform.ua
Jonathan Chen a0c13b4a90 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
2022-06-03 12:06:36 +02:00

65 lines
3.7 KiB
Text

diff -ru eclipse.platform.ua/org.eclipse.help.base/plugin.xml eclipse.platform.ua/org.eclipse.help.base/plugin.xml
--- eclipse.platform.ua/org.eclipse.help.base/plugin.xml 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ua/org.eclipse.help.base/plugin.xml 0000-00-00 00:00:00.000000000 +0000
@@ -131,7 +131,7 @@
</parameter>
<parameter
name="os"
- value="Linux,AIX,HP,SunOS">
+ value="FreeBSD,Linux,AIX,HP,SunOS">
</parameter>
</factoryclass>
</browser>
@@ -150,7 +150,7 @@
</parameter>
<parameter
name="os"
- value="Linux,AIX,HP,SunOS">
+ value="FreeBSD,Linux,AIX,HP,SunOS">
</parameter>
</factoryclass>
</browser>
@@ -169,7 +169,7 @@
</parameter>
<parameter
name="os"
- value="Linux,AIX,HP,SunOS">
+ value="FreeBSD,Linux,AIX,HP,SunOS">
</parameter>
</factoryclass>
</browser>
diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
--- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java 0000-00-00 00:00:00.000000000 +0000
@@ -35,7 +35,7 @@
prefs
.put("custom_browser_path", //$NON-NLS-1$
"\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %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
@@ -95,7 +95,7 @@
if (defaultBrowserDesc == null) {
if (Constants.WS_WIN32.equalsIgnoreCase(os)) {
setDefaultBrowserID(BROWSER_ID_SYSTEM);
- } else if (Constants.OS_LINUX.equalsIgnoreCase(os)) {
+ } else if (Constants.OS_LINUX.equalsIgnoreCase(os) || Constants.OS_FREEBSD.equalsIgnoreCase(os)) {
setDefaultBrowserID(BROWSER_ID_FIREFOX);
} else if (Constants.OS_MACOSX.equalsIgnoreCase(os)) {
setDefaultBrowserID(BROWSER_ID_MAC_SYSTEM);
diff -ru eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java
--- eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java 0000-00-00 00:00:00.000000000 +0000
@@ -67,6 +67,7 @@
*/
private boolean test() {
if (!Constants.OS_WIN32.equalsIgnoreCase(Platform.getOS())
+ && !Constants.OS_FREEBSD.equalsIgnoreCase(Platform.getOS())
&& !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS())) {
return false;
}