# HG changeset patch
# User prr
# Date 1315504833 25200
#      Thu Sep 08 11:00:33 2011 -0700
# Node ID b72e7b89dda933e52d7cfd01baa7559c70be181a
# Parent  545db1dd8c2a70c4cdb633b2e47457c4be051192
7050826: Hebrew characters are not rendered on OEL 5.6
Reviewed-by: bae, jgodinez

diff -r 545db1dd8c2a -r b72e7b89dda9 src/solaris/native/sun/awt/fontpath.c
--- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c	Wed May 04 23:23:55 2016 +0100
+++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c	Thu Sep 08 11:00:33 2011 -0700
@@ -1259,8 +1259,16 @@
 
             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,