Gervill changes

[Gary Benson]

Hi all,

OpenJDK 6 and 7 have a fix that our version of Gervill doesn't have
(http://tinyurl.com/ylm599p).  How do I go about changing that in
icedtea6?  Can I just commit a change to the file in overlays/openjdk
or do I need to do something else?

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 610a316e54d2 Makefile.am
--- a/Makefile.am	Wed Nov 25 11:41:02 2009 +0000
+++ b/Makefile.am	Tue Dec 01 12:52:39 2009 +0000
@@ -626,7 +626,8 @@
 	patches/icedtea-s390-serialize.patch \
 	patches/openjdk/6879689-hotspot_warning_fix.patch \
 	patches/icedtea-no-precompiled.patch \
-	patches/icedtea-6897844-xshm.patch
+	patches/icedtea-6897844-xshm.patch \
+	patches/openjdk/6806019-jck-midi-failures.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 610a316e54d2 patches/openjdk/6806019-jck-midi-failures.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6806019-jck-midi-failures.patch	Tue Dec 01 12:52:39 2009 +0000
@@ -0,0 +1,67 @@
+--- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java.orig	2009-12-01 12:38:45.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java	2009-12-01 12:38:53.000000000 +0000
+@@ -894,9 +894,12 @@
+             return;
+         }
+         synchronized (control_mutex) {
++            Throwable causeException = null;
+             try {
+-                if (line != null)
++                if (line != null) {
++                    // can throw IllegalArgumentException
+                     setFormat(line.getFormat());
++                }
+ 
+                 AudioInputStream ais = openStream(getFormat(), info);
+ 
+@@ -905,10 +908,13 @@
+ 
+                 if (line == null)
+                 {
+-                    if(testline != null)
++                    if (testline != null) {
+                         line = testline;
+-                    else
++                    } else {
++                        // can throw LineUnavailableException,
++                        // IllegalArgumentException, SecurityException
+                         line = AudioSystem.getSourceDataLine(getFormat());
++                    }
+                 }
+ 
+                 double latency = this.latency;
+@@ -916,6 +922,8 @@
+                 if (!line.isOpen()) {
+                     int bufferSize = getFormat().getFrameSize()
+                         * (int)(getFormat().getFrameRate() * (latency/1000000f));
++                    // can throw LineUnavailableException,
++                    // IllegalArgumentException, SecurityException
+                     line.open(getFormat(), bufferSize);
+ 
+                     // Remember that we opened that line
+@@ -959,13 +967,22 @@
+                     weakstream.sourceDataLine = sourceDataLine;
+                 }
+ 
+-
+-
+             } catch (LineUnavailableException e) {
++                causeException = e;
++            } catch (IllegalArgumentException e) {
++                causeException = e;
++            } catch (SecurityException e) {
++                causeException = e;
++            }
++
++            if (causeException != null) {
+                 if (isOpen())
+                     close();
+                 // am: need MidiUnavailableException(Throwable) ctor!
+-                throw new MidiUnavailableException(e.toString());
++                MidiUnavailableException ex = new MidiUnavailableException(
++                        "Can not open line");
++                ex.initCause(causeException);
++                throw ex;
+             }
+ 
+         }