$NetBSD: patch-ap,v 1.7 2017/08/14 00:02:16 ryoon Exp $ Use pkgsrc fontconfig. --- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2017-08-13 05:55:21.000000000 +0000 +++ jdk/src/solaris/native/sun/awt/fontpath.c @@ -73,8 +73,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 */ @@ -190,6 +190,27 @@ static char *fullAixFontPath[] = { NULL, /* terminates the list */ }; #endif +static char *pkgsrcFontPath[] = { + "@PREFIX@/share/fonts/X11/100dpi", + "@PREFIX@/share/fonts/X11/75dpi", + "@PREFIX@/share/fonts/X11/Type1", + "@PREFIX@/share/fonts/X11/cyrillic", + "@PREFIX@/share/fonts/X11/misc", + "@PREFIX@/share/fonts/X11/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(); @@ -561,6 +582,7 @@ static char *getPlatformFontPathChars(JN #elif defined(AIX) knowndirs = fullAixFontPath; #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,