diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2019-07-24 23:37:05 +0000 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2019-07-24 23:37:05 +0000 |
commit | 3b8668c653ee1eceec620c7c70e6776b9b4d2389 (patch) | |
tree | 0dfdcc60bb3691f92d08633b59ddcf258d0a0b37 /java/openjdk8/files/fontconfig.patch | |
parent | Fix the build for powerpc64 (diff) |
Fix the build for the FONTCONFIG option
* Updated the fontconfig.patch file
* Simplified FONTCONFIG to use EXTRA_PATCHES rather than a separate target
PR: 239358
Submitted by: John Hein <jcfyecrayz@liamekaens.com>, fluffy
Notes
Notes:
svn path=/head/; revision=507306
Diffstat (limited to 'java/openjdk8/files/fontconfig.patch')
-rw-r--r-- | java/openjdk8/files/fontconfig.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/java/openjdk8/files/fontconfig.patch b/java/openjdk8/files/fontconfig.patch index f304824d71e2..925eeb4714c8 100644 --- a/java/openjdk8/files/fontconfig.patch +++ b/java/openjdk8/files/fontconfig.patch @@ -142,15 +142,17 @@ /* * Class: sun_font_FreetypeFontScaler -@@ -726,32 +850,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp +@@ -698,31 +826,15 @@ return ptr_to_jlong(getNullGlyphImage()); } -- /* if algorithmic styling is required then we do not request bitmap */ -- if (context->doBold || context->doItalize) { -- renderFlags = FT_LOAD_DEFAULT; +- if (!context->useSbits) { +- renderFlags |= FT_LOAD_NO_BITMAP; - } -- ++ RenderingProperties renderingProperties; ++ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, ++ context->ptsz, context->aaType, &renderingProperties); + - /* NB: in case of non identity transform - we might also prefer to disable transform before hinting, - and apply it explicitly after hinting is performed. @@ -168,10 +170,7 @@ - target = FT_LOAD_TARGET_LCD_V; - } - renderFlags |= target; -+ RenderingProperties renderingProperties; -+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, -+ context->ptsz, context->aaType, &renderingProperties); - +- glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode); - error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); |