Date: Wed, 24 Jul 2019 23:37:06 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507306 - in head/java/openjdk8: . files Message-ID: <201907242337.x6ONb67c057360@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Wed Jul 24 23:37:05 2019 New Revision: 507306 URL: https://svnweb.freebsd.org/changeset/ports/507306 Log: 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 Modified: head/java/openjdk8/Makefile head/java/openjdk8/files/fontconfig.patch Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Wed Jul 24 23:29:39 2019 (r507305) +++ head/java/openjdk8/Makefile Wed Jul 24 23:37:05 2019 (r507306) @@ -111,6 +111,7 @@ X11_MAKE_ENV_OFF= BUILD_HEADLESS_ONLY=1 \ MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include" X11_MAKE_ENV_ON= MAKEFLAGS="" X11_USE= XORG=x11,xext,xi,xrender,xt,xtst +FONTCONFIG_EXTRA_PATCHES= ${PATCHDIR}/fontconfig.patch FONTCONFIG_IMPLIES= X11 JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} @@ -222,9 +223,6 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} post-extract-TEST-on: @${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/ - -do-patch-FONTCONFIG-on: - @${PATCH} -d ${PATCH_WRKSRC} < ${PATCHDIR}/fontconfig.patch post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete Modified: head/java/openjdk8/files/fontconfig.patch ============================================================================== --- head/java/openjdk8/files/fontconfig.patch Wed Jul 24 23:29:39 2019 (r507305) +++ head/java/openjdk8/files/fontconfig.patch Wed Jul 24 23:37:05 2019 (r507306) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907242337.x6ONb67c057360>