--- a/series	Fri Jul 18 16:54:59 2008 +0200
+++ b/series	Tue Jul 22 21:10:26 2008 +0200
@@ -13,3 +13,4 @@ fontmanager5.patch
 fontmanager5.patch
 fontmanager6.patch
 caciocavallo-GenericKeyboardFocusManagerprovide.patch
+openjdk-splashscreen.patch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/openjdk-splashscreen.patch	Tue Jul 22 21:10:26 2008 +0200
@@ -0,0 +1,95 @@
+diff -r 06b20f7715ef src/share/classes/java/awt/Window.java
+--- a/src/share/classes/java/awt/Window.java	Wed Jul 16 16:09:42 2008 +0200
++++ b/src/share/classes/java/awt/Window.java	Tue Jul 22 21:09:07 2008 +0200
+@@ -831,7 +831,15 @@
+             return;
+         }
+         if (beforeFirstWindowShown.getAndSet(false)) {
+-            SunToolkit.closeSplashScreen();
++	    try {
++		SplashScreen splash = SplashScreen.getSplashScreen();
++		if (splash != null) {
++		    splash.close();
++		}
++	    } catch (UnsupportedOperationException ex) {
++		// No need to do anything when splash screens are not
++		// supported.
++	    }
+         }
+     }
+ 
+diff -r 06b20f7715ef src/share/classes/sun/awt/SunToolkit.java
+--- a/src/share/classes/sun/awt/SunToolkit.java	Wed Jul 16 16:09:42 2008 +0200
++++ b/src/share/classes/sun/awt/SunToolkit.java	Tue Jul 22 21:09:07 2008 +0200
+@@ -1771,14 +1771,6 @@
+     public abstract void ungrab(Window w);
+ 
+ 
+-    /**
+-     * Locates the splash screen library in a platform dependent way and closes
+-     * the splash screen. Should be invoked on first top-level frame display.
+-     * @see java.awt.SplashScreen
+-     * @since 1.6
+-     */
+-    public static native void closeSplashScreen();
+-
+     /* The following methods and variables are to support retrieving
+      * desktop text anti-aliasing settings
+      */
+diff -r 06b20f7715ef src/solaris/native/sun/awt/awt_UNIXToolkit.c
+--- a/src/solaris/native/sun/awt/awt_UNIXToolkit.c	Wed Jul 16 16:09:42 2008 +0200
++++ b/src/solaris/native/sun/awt/awt_UNIXToolkit.c	Tue Jul 22 21:09:07 2008 +0200
+@@ -238,25 +238,3 @@
+     AWT_UNLOCK();
+ #endif /* !HEADLESS */
+ }
+-
+-/*
+- * Class:     sun_awt_SunToolkit
+- * Method:    closeSplashScreen
+- * Signature: ()V
+- */
+-JNIEXPORT void JNICALL
+-Java_sun_awt_SunToolkit_closeSplashScreen(JNIEnv *env, jclass cls)
+-{
+-    typedef void (*SplashClose_t)();
+-    SplashClose_t splashClose;
+-    void* hSplashLib = dlopen(0, RTLD_LAZY);
+-    if (!hSplashLib) {
+-        return;
+-    }
+-    splashClose = (SplashClose_t)dlsym(hSplashLib,
+-        "SplashClose");
+-    if (splashClose) {
+-        splashClose();
+-    }
+-    dlclose(hSplashLib);
+-}
+diff -r 06b20f7715ef src/windows/native/sun/windows/awt_Toolkit.cpp
+--- a/src/windows/native/sun/windows/awt_Toolkit.cpp	Wed Jul 16 16:09:42 2008 +0200
++++ b/src/windows/native/sun/windows/awt_Toolkit.cpp	Tue Jul 22 21:09:07 2008 +0200
+@@ -2135,24 +2135,3 @@
+     return ((GetRValue(sysColor)<<16) | (GetGValue(sysColor)<<8) |
+             (GetBValue(sysColor)) | 0xff000000);
+ }
+-
+-
+-/*
+- * Class:     sun_awt_SunToolkit
+- * Method:    closeSplashScreen
+- * Signature: ()V
+- */
+-extern "C" JNIEXPORT void JNICALL
+-Java_sun_awt_SunToolkit_closeSplashScreen(JNIEnv *env, jclass cls)
+-{
+-    typedef void (*SplashClose_t)();
+-    HMODULE hSplashDll = GetModuleHandle(_T("splashscreen.dll"));
+-    if (!hSplashDll) {
+-        return; // dll not loaded
+-    }
+-    SplashClose_t splashClose = (SplashClose_t)GetProcAddress(hSplashDll,
+-        "SplashClose");
+-    if (splashClose) {
+-        splashClose();
+-    }
+-}