diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2005-10-13 15:18:25 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2005-10-13 15:18:25 +0000 |
| commit | 77682847748a2f01f13d56a0e0a7c8af2d2efd9d (patch) | |
| tree | 45e1954d9fdf89c654eb5d45877779b51f52baef /java | |
| parent | 03fdfe46e66ea22466d5022b8b181d2d68df9ba6 (diff) | |
Notes
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk15/files/patch-j2se::awt::Toolkit.java | 20 | ||||
| -rw-r--r-- | java/jdk15/files/patch-j2se::awt::awt_LoadLibrary.c | 14 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::awt::Toolkit.java | 20 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::awt::awt_LoadLibrary.c | 14 |
4 files changed, 68 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-j2se::awt::Toolkit.java b/java/jdk15/files/patch-j2se::awt::Toolkit.java new file mode 100644 index 000000000000..704fbc3aded1 --- /dev/null +++ b/java/jdk15/files/patch-j2se::awt::Toolkit.java @@ -0,0 +1,20 @@ +$FreeBSD$ + +--- ../../j2se/src/share/classes/java/awt/Toolkit.java 10 Jan 2005 07:40:41 -0000 1.2 ++++ ../../j2se/src/share/classes/java/awt/Toolkit.java 9 Oct 2005 04:11:13 -0000 +@@ -809,12 +809,11 @@ + try { + String defaultToolkit; + +- /* XXXBSD: analyze and choose better one */ +- if (System.getProperty("os.name").equals("Linux")) { +- defaultToolkit = "sun.awt.X11.XToolkit"; ++ if (System.getProperty("os.name").equals("SunOS")) { ++ defaultToolkit = "sun.awt.motif.MToolkit"; + } + else { +- defaultToolkit = "sun.awt.motif.MToolkit"; ++ defaultToolkit = "sun.awt.X11.XToolkit"; + } + nm = System.getProperty("awt.toolkit", + defaultToolkit); diff --git a/java/jdk15/files/patch-j2se::awt::awt_LoadLibrary.c b/java/jdk15/files/patch-j2se::awt::awt_LoadLibrary.c new file mode 100644 index 000000000000..78f72ff9b612 --- /dev/null +++ b/java/jdk15/files/patch-j2se::awt::awt_LoadLibrary.c @@ -0,0 +1,14 @@ +$FreeBSD$ + +--- ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 10 Jan 2005 15:09:40 -0000 1.2 ++++ ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 9 Oct 2005 05:34:52 -0000 +@@ -195,8 +195,7 @@ + } + } + else { +-/* XXXBSD: decide which toolkit to use */ +-#if defined(__linux) ++#if defined(__linux) || defined(_ALLBSD_SOURCE) + /* Default AWT Toolkit on Linux is XAWT. */ + strcpy(p, "/xawt/libmawt"); + XAWT = 1; diff --git a/java/jdk16/files/patch-j2se::awt::Toolkit.java b/java/jdk16/files/patch-j2se::awt::Toolkit.java new file mode 100644 index 000000000000..704fbc3aded1 --- /dev/null +++ b/java/jdk16/files/patch-j2se::awt::Toolkit.java @@ -0,0 +1,20 @@ +$FreeBSD$ + +--- ../../j2se/src/share/classes/java/awt/Toolkit.java 10 Jan 2005 07:40:41 -0000 1.2 ++++ ../../j2se/src/share/classes/java/awt/Toolkit.java 9 Oct 2005 04:11:13 -0000 +@@ -809,12 +809,11 @@ + try { + String defaultToolkit; + +- /* XXXBSD: analyze and choose better one */ +- if (System.getProperty("os.name").equals("Linux")) { +- defaultToolkit = "sun.awt.X11.XToolkit"; ++ if (System.getProperty("os.name").equals("SunOS")) { ++ defaultToolkit = "sun.awt.motif.MToolkit"; + } + else { +- defaultToolkit = "sun.awt.motif.MToolkit"; ++ defaultToolkit = "sun.awt.X11.XToolkit"; + } + nm = System.getProperty("awt.toolkit", + defaultToolkit); diff --git a/java/jdk16/files/patch-j2se::awt::awt_LoadLibrary.c b/java/jdk16/files/patch-j2se::awt::awt_LoadLibrary.c new file mode 100644 index 000000000000..78f72ff9b612 --- /dev/null +++ b/java/jdk16/files/patch-j2se::awt::awt_LoadLibrary.c @@ -0,0 +1,14 @@ +$FreeBSD$ + +--- ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 10 Jan 2005 15:09:40 -0000 1.2 ++++ ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 9 Oct 2005 05:34:52 -0000 +@@ -195,8 +195,7 @@ + } + } + else { +-/* XXXBSD: decide which toolkit to use */ +-#if defined(__linux) ++#if defined(__linux) || defined(_ALLBSD_SOURCE) + /* Default AWT Toolkit on Linux is XAWT. */ + strcpy(p, "/xawt/libmawt"); + XAWT = 1; |