update Sat Nov 7 12:37:00 PST 2009

[pkgsrc.git] / lang / openjdk7 / patches / patch-aq

diff --git a/lang/openjdk7/patches/patch-aq b/lang/openjdk7/patches/patch-aq
index 5c9a9a7..a9638cd 100644 (file)
--- a/lang/openjdk7/patches/patch-aq
+++ b/lang/openjdk7/patches/patch-aq
@@ -1,17 +1,13 @@
-$NetBSD: patch-aq,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-aq,v 1.2 2009/11/07 14:48:50 tnn Exp $
 
---- jdk/src/share/classes/sun/font/FontManager.java.orig       2008-12-19 09:45:40.000000000 +0100
-+++ jdk/src/share/classes/sun/font/FontManager.java
-@@ -3410,6 +3410,12 @@ public final class FontManager {
-             info[1] = info[1] + File.separator + "arial.ttf";
-         } else {
-             initFontConfigFonts(false);
-+            if (fontConfigFonts == null) {
-+                     info[0] = "nonexistent";
-+                     info[1] = "/nonexistent.ttf";
-+                     defaultPlatformFont = info;
-+                     return defaultPlatformFont;
-+            }
-             for (int i=0; i<fontConfigFonts.length; i++) {
-                 if ("sans".equals(fontConfigFonts[i].fcFamily) &&
-                     0 == fontConfigFonts[i].style) {
+--- jdk/make/tools/src/build/tools/fontchecker/FontChecker.java.orig   2009-10-30 08:48:07.000000000 +0100
++++ jdk/make/tools/src/build/tools/fontchecker/FontChecker.java
+@@ -336,7 +336,7 @@ public class FontChecker implements Acti
+          * to trigger a more normal initialisation.
+          */
+         java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment();
+-        String fontPath = FontManager.getFontPath(true);
++        String fontPath = ""; // FontManager.getFontPath(true);
+         StringTokenizer st =
+             new StringTokenizer(fontPath,
+                                 System.getProperty("path.separator"));