src/java.desktop/unix/classes/sun/awt/X11FontManager.java

rev 59106 : imported patch client

*** 706,717 ****
           * use the preconfigured file.
           * If synthesising fails, we fall back to any preconfigured file
           * and do the best we can.
           */
          FontConfiguration mFontConfig = new MFontConfiguration(this);
!         if ((FontUtilities.isLinux && !mFontConfig.foundOsSpecificFile()) ||
!             (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent())) {
              FcFontConfiguration fcFontConfig =
                  new FcFontConfiguration(this);
              if (fcFontConfig.init()) {
                  return fcFontConfig;
              }
--- 706,716 ----
           * use the preconfigured file.
           * If synthesising fails, we fall back to any preconfigured file
           * and do the best we can.
           */
          FontConfiguration mFontConfig = new MFontConfiguration(this);
!         if ((FontUtilities.isLinux && !mFontConfig.foundOsSpecificFile())) {
              FcFontConfiguration fcFontConfig =
                  new FcFontConfiguration(this);
              if (fcFontConfig.init()) {
                  return fcFontConfig;
              }