# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1465887663 -3600
# Node ID c1f3d710554507dca6a1fb74f6d3ff4468917698
# Parent  24ce0141709be9f50787f2bb407d7eadaafe2a7e
S7050826, PR2956, RH1334465: Hebrew characters are not rendered on OEL 5.6

2016-05-16  Andrew John Hughes  <gnu.andrew@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.

diff -r 24ce0141709b -r c1f3d7105545 ChangeLog
--- a/ChangeLog	Tue Jun 14 07:56:05 2016 +0100
+++ b/ChangeLog	Tue Jun 14 08:01:03 2016 +0100
@@ -1,3 +1,14 @@
+2016-05-16  Andrew John Hughes  <gnu.andrew@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@redhat.com>
 
 	PR2954: ecj/override.patch is missing new
diff -r 24ce0141709b -r c1f3d7105545 Makefile.am
--- a/Makefile.am	Tue Jun 14 07:56:05 2016 +0100
+++ b/Makefile.am	Tue Jun 14 08:01:03 2016 +0100
@@ -626,7 +626,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 24ce0141709b -r c1f3d7105545 NEWS
--- a/NEWS	Tue Jun 14 07:56:05 2016 +0100
+++ b/NEWS	Tue Jun 14 08:01:03 2016 +0100
@@ -14,6 +14,8 @@
 
 New in release 1.13.12 (2016-07-XX):
 
+* Backports
+  - S7050826, PR2956, RH1334465: Hebrew characters are not rendered on OEL 5.6
 * Bug fixes
   - PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
 
diff -r 24ce0141709b -r c1f3d7105545 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 Jun 14 08:01:03 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,