diff --git a/jdk/src/solaris/native/sun/awt/fontpath.c b/jdk/src/solaris/native/sun/awt/fontpath.c index 98d6f1419fc..db6f8fa9539 100644 --- a/jdk/src/solaris/native/sun/awt/fontpath.c +++ b/jdk/src/solaris/native/sun/awt/fontpath.c @@ -1191,8 +1191,16 @@ Java_sun_font_FontConfigManager_getFontConfig fontformat = NULL; (*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat); - if (fontformat != NULL && strcmp((char*)fontformat, "TrueType") - != 0) { + /* We only want TrueType fonts but some Linuxes still depend + * on Type 1 fonts for some Locale support, so we'll allow + * them there. + */ + if (fontformat != NULL + && (strcmp((char*)fontformat, "TrueType") != 0) +#ifdef __linux__ + && (strcmp((char*)fontformat, "Type 1") != 0) +#endif + ) { continue; } result = (*FcPatternGetCharSet)(fontPattern,