Attachment #206010 for bug #239358




RUN_DEPENDS=	javavm:java/javavmwrapper \
		dejavu>0:x11-fonts/dejavu

USES=		compiler:features gmake iconv pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	battleblow
GH_PROJECT=	openjdk-jdk8u


ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64

SHEBANG_FILES=	configure

_MAKE_JOBS=	#
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

			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}

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
	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

Lines 1-4 Link Here

(-)files/fontconfig.patch (-19 / +18 lines)
1	--- jdk/src/share/native/sun/font/freetypeScaler.c.orig 2017-01-20 17:04:07 UTC	1	--- jdk/make/lib/Awt2dLibraries.gmk.orig 2019-07-18 21:55:16 UTC
		2	+++ jdk/make/lib/Awt2dLibraries.gmk
		3	@@ -943,7 +943,7 @@
		4	LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
		5	LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
		6	LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
		7	- LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
		8	+ LDFLAGS_SUFFIX_bsd := -L%%LOCALBASE%%/lib -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
		9	LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
		10	-ljava -ljvm, \
		11	LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
		12	--- jdk/src/share/native/sun/font/freetypeScaler.c.orig 2019-07-18 21:55:16 UTC
2	+++ jdk/src/share/native/sun/font/freetypeScaler.c	13	+++ jdk/src/share/native/sun/font/freetypeScaler.c
3	@@ -38,6 +38,8 @@	14	@@ -38,6 +38,8 @@
4	#include FT_SIZES_H	15	#include FT_SIZES_H
Lines 9-15 Link Here
9		20
10	#include "fontscaler.h"	21	#include "fontscaler.h"
11		22
12	@@ -693,6 +695,132 @@ static void CopyFTSubpixelVToSubpixel(co	23	@@ -665,6 +667,132 @@ static void CopyFTSubpixelVToSubpixel(co
13	}	24	}
14	}	25	}
15		26
Lines 142-154 Link Here
142		153
143	/*	154	/*
144	* Class: sun_font_FreetypeFontScaler	155	* Class: sun_font_FreetypeFontScaler
145	@@ -726,32 +850,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp	156	@@ -698,31 +826,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp
146	return ptr_to_jlong(getNullGlyphImage());	157	return ptr_to_jlong(getNullGlyphImage());
147	}	158	}
148		159
149	- /* if algorithmic styling is required then we do not request bitmap */	160	- if (!context->useSbits) {
150	- if (context->doBold \|\| context->doItalize) {	161	- renderFlags \|= FT_LOAD_NO_BITMAP;
151	- renderFlags = FT_LOAD_DEFAULT;
152	- }	162	- }
153	-	163	-
154	- /* NB: in case of non identity transform	164	- /* NB: in case of non identity transform
Lines 181-187 Link Here
181	if (error) {	191	if (error) {
182	//do not destroy scaler yet.	192	//do not destroy scaler yet.
183	//this can be problem of particular context (e.g. with bad transform)	193	//this can be problem of particular context (e.g. with bad transform)
184	@@ -770,9 +877,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp	194	@@ -741,9 +853,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp
185		195
186	/* generate bitmap if it is not done yet	196	/* generate bitmap if it is not done yet
187	e.g. if algorithmic styling is performed and style was added to outline */	197	e.g. if algorithmic styling is performed and style was added to outline */
Lines 192-198 Link Here
192		202
193	width = (UInt16) ftglyph->bitmap.width;	203	width = (UInt16) ftglyph->bitmap.width;
194	height = (UInt16) ftglyph->bitmap.rows;	204	height = (UInt16) ftglyph->bitmap.rows;
195	@@ -1001,11 +1106,14 @@ static FT_Outline* getFTOutline(JNIEnv*	205	@@ -972,11 +1082,14 @@ static FT_Outline* getFTOutline(JNIEnv*
196	return NULL;	206	return NULL;
197	}	207	}
198		208
Lines 209-222 Link Here
209	if (error) {	219	if (error) {
210	return NULL;	220	return NULL;
211	}	221	}
212	--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-07-18 14:30:01.000000000 -0700
213	+++ jdk/make/lib/Awt2dLibraries.gmk 2015-07-18 14:30:08.000000000 -0700
214	@@ -943,7 +943,7 @@
215	LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
216	LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
217	LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
218	- LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
219	+ LDFLAGS_SUFFIX_bsd := -L%%LOCALBASE%%/lib -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
220	LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
221	-ljava -ljvm, \
222	LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \

Return to bug 239358

Lines 21-27 Link Here

(-)Makefile (-6 / +2 lines)
21	RUN_DEPENDS= javavm:java/javavmwrapper \	21	RUN_DEPENDS= javavm:java/javavmwrapper \
22	dejavu>0:x11-fonts/dejavu	22	dejavu>0:x11-fonts/dejavu
23		23
24	USES= compiler:features gmake iconv pkgconfig shebangfix	24	USES= compiler:features gmake iconv pkgconfig
25	USE_GITHUB= yes	25	USE_GITHUB= yes
26	GH_ACCOUNT= battleblow	26	GH_ACCOUNT= battleblow
27	GH_PROJECT= openjdk-jdk8u	27	GH_PROJECT= openjdk-jdk8u
Lines 29-36 Link Here
29		29
30	ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64	30	ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64
31		31
32	SHEBANG_FILES= configure
33
34	_MAKE_JOBS= #	32	_MAKE_JOBS= #
35	CPPFLAGS+= -I${LOCALBASE}/include	33	CPPFLAGS+= -I${LOCALBASE}/include
36	LDFLAGS+= -L${LOCALBASE}/lib	34	LDFLAGS+= -L${LOCALBASE}/lib
Lines 111-116 Link Here
111	MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include"	109	MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include"
112	X11_MAKE_ENV_ON= MAKEFLAGS=""	110	X11_MAKE_ENV_ON= MAKEFLAGS=""
113	X11_USE= XORG=x11,xext,xi,xrender,xt,xtst	111	X11_USE= XORG=x11,xext,xi,xrender,xt,xtst
		112	FONTCONFIG_EXTRA_PATCHES= ${PATCHDIR}/fontconfig.patch
114	FONTCONFIG_IMPLIES= X11	113	FONTCONFIG_IMPLIES= X11
115		114
116	JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}	115	JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
Lines 223-231 Link Here
223	post-extract-TEST-on:	222	post-extract-TEST-on:
224	@${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/	223	@${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/
225		224
226	do-patch-FONTCONFIG-on:
227	@${PATCH} -d ${PATCH_WRKSRC} < ${PATCHDIR}/fontconfig.patch
228
229	post-patch:	225	post-patch:
230	@${FIND} ${WRKSRC} -name '*.orig' -delete	226	@${FIND} ${WRKSRC} -name '*.orig' -delete
231	@${SED} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \	227	@${SED} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \