[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Add hack to avoid NPE in sun.awt.X11Font...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1eea95139796
branches:  trunk
changeset: 567110:1eea95139796
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Nov 08 00:22:07 2009 +0000

description:
Add hack to avoid NPE in sun.awt.X11FontManager.getDefaultPlatformFont.
Should make gui apps work again. Bump rev.

diffstat:

 lang/openjdk7/Makefile         |   3 ++-
 lang/openjdk7/distinfo         |   3 ++-
 lang/openjdk7/patches/patch-ak |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r d62197875f90 -r 1eea95139796 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Sat Nov 07 18:43:36 2009 +0000
+++ b/lang/openjdk7/Makefile    Sun Nov 08 00:22:07 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2009/11/07 14:48:49 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2009/11/08 00:22:07 tnn Exp $
 
 DISTNAME=      openjdk-7-ea-src-b75-30_oct_2009
 PKGNAME=       openjdk7-1.7.0.75.20091106
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.bz2
diff -r d62197875f90 -r 1eea95139796 lang/openjdk7/distinfo
--- a/lang/openjdk7/distinfo    Sat Nov 07 18:43:36 2009 +0000
+++ b/lang/openjdk7/distinfo    Sun Nov 08 00:22:07 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/11/07 14:48:49 tnn Exp $
+$NetBSD: distinfo,v 1.6 2009/11/08 00:22:07 tnn Exp $
 
 SHA1 (openjdk7/9eb43c172d5b.tar.bz2) = 148136f77c5f565c27cfb2b1346363469becc5ab
 RMD160 (openjdk7/9eb43c172d5b.tar.bz2) = 7c79d15754eae87c543a131a36e26b52fb30e7e7
@@ -49,6 +49,7 @@
 SHA1 (patch-ah) = 2632580f92b27506c33df8714ed163ef3ed9844f
 SHA1 (patch-ai) = 6d6c394c3de7578754b901686b88142cbc524ef7
 SHA1 (patch-aj) = e370b618f4417d5ca19164c8eb59075123179b5a
+SHA1 (patch-ak) = 20ee0527aa3e6cbaf7e0419cc09feed0465379ea
 SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6
 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
 SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1
diff -r d62197875f90 -r 1eea95139796 lang/openjdk7/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk7/patches/patch-ak    Sun Nov 08 00:22:07 2009 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 2009/11/08 00:22:07 tnn Exp $
+
+--- jdk/src/solaris/classes/sun/awt/X11FontManager.java.orig   2009-11-08 01:12:18.000000000 +0100
++++ jdk/src/solaris/classes/sun/awt/X11FontManager.java
+@@ -790,6 +790,11 @@ public class X11FontManager extends SunF
+         getFontConfigManager().initFontConfigFonts(false);
+         FontConfigManager.FcCompFont[] fontConfigFonts =
+             getFontConfigManager().getFontConfigFonts();
++      if (fontConfigFonts == null) {
++            info[0] = "nonexistent";
++            info[1] = "/nonexistent.ttf";
++            return info;
++      }
+         for (int i=0; i<fontConfigFonts.length; i++) {
+             if ("sans".equals(fontConfigFonts[i].fcFamily) &&
+                 0 == fontConfigFonts[i].style) {