From 77682847748a2f01f13d56a0e0a7c8af2d2efd9d Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Thu, 13 Oct 2005 15:18:25 +0000
Subject: [PATCH] . Switch to using XToolkit by default.  According to

  http://java.sun.com/j2se/1.5.0/docs/guide/awt/1.5/xawt.html

  it has some advantages over XToolkit.  Its also the default on Linux
  and Solaris will be switching to it.  Some people have reported that
  it fixes a crash in the browser plugin for them.

  Please let me know straight away if this causes problems, particularly
  with Swing, as it hasn't been extensively tested.  The web page
  mentioned above explains how to switch the toolkits dynamically so you
  can compare them.

Submitted by:	Huang wen hui <hwh@gddsn.org.cn>
                (the awt_LoadLibrary.c patch)
Approved by:	phantom (maintainer)
---
 .../jdk15/files/patch-j2se::awt::Toolkit.java | 20 +++++++++++++++++++
 .../files/patch-j2se::awt::awt_LoadLibrary.c  | 14 +++++++++++++
 .../jdk16/files/patch-j2se::awt::Toolkit.java | 20 +++++++++++++++++++
 .../files/patch-j2se::awt::awt_LoadLibrary.c  | 14 +++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 java/jdk15/files/patch-j2se::awt::Toolkit.java
 create mode 100644 java/jdk15/files/patch-j2se::awt::awt_LoadLibrary.c
 create mode 100644 java/jdk16/files/patch-j2se::awt::Toolkit.java
 create mode 100644 java/jdk16/files/patch-j2se::awt::awt_LoadLibrary.c

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;