sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-09 23:00:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the build for the FONTCONFIG option

Browse source 
* 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
This commit is contained in:
Greg Lewis 2019-07-24 23:37:05 +00:00
parent ded732340a
commit 3b8668c653
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=507306
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/openjdk8/Makefile
View file

@ -111,6 +111,7 @@ X11_MAKE_ENV_OFF= BUILD_HEADLESS_ONLY=1 \
MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include" MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include"
X11_MAKE_ENV_ON= MAKEFLAGS="" X11_MAKE_ENV_ON= MAKEFLAGS=""
X11_USE= XORG=x11,xext,xi,xrender,xt,xtst X11_USE= XORG=x11,xext,xi,xrender,xt,xtst
FONTCONFIG_EXTRA_PATCHES= ${PATCHDIR}/fontconfig.patch
FONTCONFIG_IMPLIES= X11 FONTCONFIG_IMPLIES= X11
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
@ -223,9 +224,6 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB}
post-extract-TEST-on: post-extract-TEST-on:
@${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/ @${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/
do-patch-FONTCONFIG-on:
@${PATCH} -d ${PATCH_WRKSRC} < ${PATCHDIR}/fontconfig.patch
post-patch: post-patch:
@${FIND} ${WRKSRC} -name '*.orig' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete
@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

17
java/openjdk8/files/fontconfig.patch
View file

@ -142,15 +142,17 @@
/* /*
* Class: sun_font_FreetypeFontScaler * Class: sun_font_FreetypeFontScaler
@@ -726,32 +850,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp @@ -698,31 +826,15 @@
return ptr_to_jlong(getNullGlyphImage()); return ptr_to_jlong(getNullGlyphImage());
} }
- /* if algorithmic styling is required then we do not request bitmap */ - if (!context->useSbits) {
- if (context->doBold || context->doItalize) { - renderFlags |= FT_LOAD_NO_BITMAP;
- renderFlags = FT_LOAD_DEFAULT;
- } - }
- + RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
- /* NB: in case of non identity transform - /* NB: in case of non identity transform
- we might also prefer to disable transform before hinting, - we might also prefer to disable transform before hinting,
- and apply it explicitly after hinting is performed. - and apply it explicitly after hinting is performed.
@ -168,10 +170,7 @@
- target = FT_LOAD_TARGET_LCD_V; - target = FT_LOAD_TARGET_LCD_V;
- } - }
- renderFlags |= target; - 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); glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); - error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);