/hg/icedtea6: S7050826, PR2956, RH1334465: Hebrew characters are...

[andrew at icedtea.classpath.org]

changeset 40d81bb30914 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=40d81bb30914
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue May 17 23:38:10 2016 +0100

	S7050826, PR2956, RH1334465: Hebrew characters are not rendered on OEL 5.6

	2016-05-16  Andrew John Hughes  <gnu.andrew at redhat.com>

		S7050826, PR2956, RH1334465: Hebrew characters
		are not rendered on OEL 5.6
		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patch.
		* NEWS: Updated.
		* patches/openjdk/7050826-pr2956-allow_type1_fonts.patch:
		Backport to allow Type 1 fonts to be used with
		font configurations auto-generated by fontconfig.


diffstat:

 ChangeLog                                              |  11 ++++++
 Makefile.am                                            |   3 +-
 NEWS                                                   |   1 +
 patches/openjdk/7050826-pr2956-allow_type1_fonts.patch |  31 ++++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletions(-)

diffs (77 lines):

diff -r 01e3d9c141e6 -r 40d81bb30914 ChangeLog
--- a/ChangeLog	Mon May 16 15:16:29 2016 +0100
+++ b/ChangeLog	Tue May 17 23:38:10 2016 +0100
@@ -1,3 +1,14 @@
+2016-05-16  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	S7050826, PR2956, RH1334465: Hebrew characters
+	are not rendered on OEL 5.6
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Updated.
+	* patches/openjdk/7050826-pr2956-allow_type1_fonts.patch:
+	Backport to allow Type 1 fonts to be used with
+	font configurations auto-generated by fontconfig.
+
 2016-05-13  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	PR2957: Build bootstrap code (rt-class-files.stamp)
diff -r 01e3d9c141e6 -r 40d81bb30914 Makefile.am
--- a/Makefile.am	Mon May 16 15:16:29 2016 +0100
+++ b/Makefile.am	Tue May 17 23:38:10 2016 +0100
@@ -640,7 +640,8 @@
 	patches/openjdk/8071705-pr2820-menu_misbehaviour.patch \
 	patches/openjdk/8150954-pr2868-composite_desktop.patch \
 	patches/pr2890-system_cacerts.patch \
-	patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch
+	patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch \
+	patches/openjdk/7050826-pr2956-allow_type1_fonts.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 01e3d9c141e6 -r 40d81bb30914 NEWS
--- a/NEWS	Mon May 16 15:16:29 2016 +0100
+++ b/NEWS	Tue May 17 23:38:10 2016 +0100
@@ -19,6 +19,7 @@
   - S6727719: Performance of TextLayout.getBounds()
   - S6745225: Memory leak while drawing Attributed String
   - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
+  - S7050826, PR2956, RH1334465: Hebrew characters are not rendered on OEL 5.6
   - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
   - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
   - S8026887: Make issues due to failed large pages allocations easier to debug
diff -r 01e3d9c141e6 -r 40d81bb30914 patches/openjdk/7050826-pr2956-allow_type1_fonts.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7050826-pr2956-allow_type1_fonts.patch	Tue May 17 23:38:10 2016 +0100
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User prr
+# Date 1315504833 25200
+#      Thu Sep 08 11:00:33 2011 -0700
+# Node ID b72e7b89dda933e52d7cfd01baa7559c70be181a
+# Parent  545db1dd8c2a70c4cdb633b2e47457c4be051192
+7050826: Hebrew characters are not rendered on OEL 5.6
+Reviewed-by: bae, jgodinez
+
+diff -r 545db1dd8c2a -r b72e7b89dda9 src/solaris/native/sun/awt/fontpath.c
+--- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c	Wed May 04 23:23:55 2016 +0100
++++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c	Thu Sep 08 11:00:33 2011 -0700
+@@ -1259,8 +1259,16 @@
+ 
+             fontformat = NULL;
+             (*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat);
+-            if (fontformat != NULL && strcmp((char*)fontformat, "TrueType")
+-                != 0) {
++            /* We only want TrueType fonts but some Linuxes still depend
++             * on Type 1 fonts for some Locale support, so we'll allow
++             * them there.
++             */
++            if (fontformat != NULL
++                && (strcmp((char*)fontformat, "TrueType") != 0)
++#ifdef __linux__
++                && (strcmp((char*)fontformat, "Type 1") != 0)
++#endif
++             ) {
+                 continue;
+             }
+             result = (*FcPatternGetCharSet)(fontPattern,