# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1464134578 -3600
# Node ID 4edf659669aaa6534b749490a3d257ef5c175e97
# Parent  193acb643c5f8d28717347366fc2701283999a3e
Remove fix for PR2956 as available upstream.

2016-05-24  Andrew John Hughes  <gnu.andrew@redhat.com>

	* patches/openjdk/7050826-pr2956-allow_type1_fonts.patch:
	Removed as pushed upstream.
	* Makefile.am:
	(ICEDTEA_PATCHES): Remove above patch.

diff -r 193acb643c5f -r 4edf659669aa ChangeLog
--- a/ChangeLog	Tue May 24 20:28:33 2016 +0100
+++ b/ChangeLog	Wed May 25 01:02:58 2016 +0100
@@ -1,3 +1,10 @@
+2016-05-24  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/openjdk/7050826-pr2956-allow_type1_fonts.patch:
+	Removed as pushed upstream.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove above patch.
+
 2016-05-24  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR2969: ENABLE_SYSTEM_LCMS is not defined
diff -r 193acb643c5f -r 4edf659669aa Makefile.am
--- a/Makefile.am	Tue May 24 20:28:33 2016 +0100
+++ b/Makefile.am	Wed May 25 01:02:58 2016 +0100
@@ -640,8 +640,7 @@
 	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/7050826-pr2956-allow_type1_fonts.patch
+	patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 193acb643c5f -r 4edf659669aa patches/openjdk/7050826-pr2956-allow_type1_fonts.patch
--- a/patches/openjdk/7050826-pr2956-allow_type1_fonts.patch	Tue May 24 20:28:33 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# 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,