Attachment 206010 Details for Bug 239358 – [patch] fix fontconfig patch after jdk8u222 + remove unnecessary shebangfix

[patch] [patch] fix fontconfig patch after jdk8u222 + remove unnecessary shebangfix

pr-openjdk8-fix-fontconfig+no-shebang.diff (text/plain), 4.58 KB, created by John Hein on 2019-07-23 14:45:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2019-07-23 14:45:15 UTC

Size: 4.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 507212)
>+++ Makefile	(working copy)
>@@ -21,7 +21,7 @@
> RUN_DEPENDS=	javavm:java/javavmwrapper \
> 		dejavu>0:x11-fonts/dejavu
> 
>-USES=		compiler:features gmake iconv pkgconfig shebangfix
>+USES=		compiler:features gmake iconv pkgconfig
> USE_GITHUB=	yes
> GH_ACCOUNT=	battleblow
> GH_PROJECT=	openjdk-jdk8u
>@@ -29,8 +29,6 @@
> 
> ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64
> 
>-SHEBANG_FILES=	configure
>-
> _MAKE_JOBS=	#
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>@@ -111,6 +109,7 @@
> 			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}
>@@ -223,9 +222,6 @@
> 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}|' \
>Index: files/fontconfig.patch
>===================================================================
>--- files/fontconfig.patch	(revision 507212)
>+++ files/fontconfig.patch	(working copy)
>@@ -1,4 +1,15 @@
>---- jdk/src/share/native/sun/font/freetypeScaler.c.orig	2017-01-20 17:04:07 UTC
>+--- jdk/make/lib/Awt2dLibraries.gmk.orig	2019-07-18 21:55:16 UTC
>++++ jdk/make/lib/Awt2dLibraries.gmk
>+@@ -943,7 +943,7 @@
>+     LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
>+     LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
>+     LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
>+-    LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
>++    LDFLAGS_SUFFIX_bsd := -L%%LOCALBASE%%/lib -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
>+     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
>+         -ljava -ljvm, \
>+     LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
>+--- jdk/src/share/native/sun/font/freetypeScaler.c.orig	2019-07-18 21:55:16 UTC
> +++ jdk/src/share/native/sun/font/freetypeScaler.c
> @@ -38,6 +38,8 @@
>  #include FT_SIZES_H
>@@ -9,7 +20,7 @@
>  
>  #include "fontscaler.h"
>  
>-@@ -693,6 +695,132 @@ static void CopyFTSubpixelVToSubpixel(co
>+@@ -665,6 +667,132 @@ static void CopyFTSubpixelVToSubpixel(co
>      }
>  }
>  
>@@ -142,13 +153,12 @@
>  
>  /*
>   * Class:     sun_font_FreetypeFontScaler
>-@@ -726,32 +850,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp
>+@@ -698,31 +826,15 @@ Java_sun_font_FreetypeFontScaler_getGlyp
>          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;
> -    }
> -
> -    /* NB: in case of non identity transform
>@@ -181,7 +191,7 @@
>      if (error) {
>          //do not destroy scaler yet.
>          //this can be problem of particular context (e.g. with bad transform)
>-@@ -770,9 +877,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp
>+@@ -741,9 +853,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp
>  
>      /* generate bitmap if it is not done yet
>       e.g. if algorithmic styling is performed and style was added to outline */
>@@ -192,7 +202,7 @@
>  
>      width  = (UInt16) ftglyph->bitmap.width;
>      height = (UInt16) ftglyph->bitmap.rows;
>-@@ -1001,11 +1106,14 @@ static FT_Outline* getFTOutline(JNIEnv* 
>+@@ -972,11 +1082,14 @@ static FT_Outline* getFTOutline(JNIEnv* 
>          return NULL;
>      }
>  
>@@ -209,14 +219,3 @@
>      if (error) {
>          return NULL;
>      }
>---- jdk/make/lib/Awt2dLibraries.gmk.orig	2015-07-18 14:30:01.000000000 -0700
>-+++ jdk/make/lib/Awt2dLibraries.gmk	2015-07-18 14:30:08.000000000 -0700
>-@@ -943,7 +943,7 @@
>-     LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
>-     LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
>-     LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
>--    LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
>-+    LDFLAGS_SUFFIX_bsd := -L%%LOCALBASE%%/lib -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
>-     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
>-         -ljava -ljvm, \
>-     LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \

Flags:

jcfyecrayz: maintainer-approval? (java)

Actions: View | Diff

Attachments on bug 239358: 205991 | 206010