d6507943e0
Really fixes NullPointerException in getDefaultPlatformFont. Remove previous hack and bump revision again.
51 lines
2 KiB
Text
51 lines
2 KiB
Text
$NetBSD: patch-ap,v 1.3 2009/11/08 17:57:46 tnn Exp $
|
|
|
|
--- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2009-11-08 11:51:19.000000000 +0100
|
|
+++ jdk/src/solaris/native/sun/awt/fontpath.c
|
|
@@ -70,8 +70,8 @@ extern Display *awt_display;
|
|
#define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1")
|
|
#define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig")
|
|
#else
|
|
-#define FONTCONFIG_DLL_VERSIONED VERSIONED_JNI_LIB_NAME("fontconfig", "1")
|
|
-#define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig")
|
|
+#define FONTCONFIG_DLL_VERSIONED "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
|
|
+#define FONTCONFIG_DLL "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
|
|
#endif
|
|
|
|
#define MAXFDIRS 512 /* Max number of directories that contain fonts */
|
|
@@ -163,6 +163,27 @@ static char *fullLinuxFontPath[] = {
|
|
NULL, /* terminates the list */
|
|
};
|
|
#endif
|
|
+static char *pkgsrcFontPath[] = {
|
|
+ "@PREFIX@/lib/X11/fonts/100dpi",
|
|
+ "@PREFIX@/lib/X11/fonts/75dpi",
|
|
+ "@PREFIX@/lib/X11/fonts/Type1",
|
|
+ "@PREFIX@/lib/X11/fonts/cyrillic",
|
|
+ "@PREFIX@/lib/X11/fonts/misc",
|
|
+ "@PREFIX@/lib/X11/fonts/TTF",
|
|
+ "/usr/X11R7/lib/X11/fonts/100dpi",
|
|
+ "/usr/X11R7/lib/X11/fonts/75dpi",
|
|
+ "/usr/X11R7/lib/X11/fonts/Type1",
|
|
+ "/usr/X11R7/lib/X11/fonts/cyrillic",
|
|
+ "/usr/X11R7/lib/X11/fonts/misc",
|
|
+ "/usr/X11R7/lib/X11/fonts/TTF",
|
|
+ "/usr/X11R6/lib/X11/fonts/100dpi",
|
|
+ "/usr/X11R6/lib/X11/fonts/75dpi",
|
|
+ "/usr/X11R6/lib/X11/fonts/Type1",
|
|
+ "/usr/X11R6/lib/X11/fonts/cyrillic",
|
|
+ "/usr/X11R6/lib/X11/fonts/misc",
|
|
+ "/usr/X11R6/lib/X11/fonts/TTF",
|
|
+ NULL
|
|
+};
|
|
|
|
static char **getFontConfigLocations();
|
|
|
|
@@ -525,6 +546,7 @@ static char *getPlatformFontPathChars(JN
|
|
#else /* IF SOLARIS */
|
|
knowndirs = fullSolarisFontPath;
|
|
#endif
|
|
+ knowndirs = pkgsrcFontPath;
|
|
|
|
/* REMIND: this code requires to be executed when the GraphicsEnvironment
|
|
* is already initialised. That is always true, but if it were not so,
|