--- a/ChangeLog	Wed May 25 01:02:58 2016 +0100
+++ b/ChangeLog	Wed Aug 10 05:13:49 2016 +0100
@@ -1,3 +1,10 @@
+2016-08-09  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch:
+	Removed as applied upstream.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove above patch.
+
 2016-05-24  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* patches/openjdk/7050826-pr2956-allow_type1_fonts.patch:

--- a/Makefile.am	Wed May 25 01:02:58 2016 +0100
+++ b/Makefile.am	Wed Aug 10 05:13:49 2016 +0100
@@ -445,7 +445,6 @@
 	patches/openjdk/7049339-anyblit-broken.patch \
 	patches/openjdk/4917091-javac_rejects_array_over_128_in_length.patch \
 	patches/openjdk/6390045-error_cannot_access_java_lang_void.patch \
-	patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch \
 	patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch \
 	patches/openjdk/6934356-Vector_writeObject_serialization_DL.patch \
 	patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch \

--- a/patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch	Wed May 25 01:02:58 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1230141468 28800
-# Node ID 40ec164889bd9ec1955e36864593bc222474ba43
-# Parent  f68864fe53d39a994f53ee8dd5c8e9875076e95f
-6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws NPE on Linux
-Reviewed-by: bae, igor
-
-diff -r f68864fe53d3 -r 40ec164889bd src/share/classes/java/awt/GraphicsEnvironment.java
---- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java	Wed Dec 24 09:53:52 2008 -0800
-+++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java	Wed Dec 24 09:57:48 2008 -0800
-@@ -356,6 +356,9 @@
-      * @since 1.5
-      */
-     public void preferLocaleFonts() {
-+        if (!(this instanceof SunGraphicsEnvironment)) {
-+            return;
-+        }
-         sun.font.FontManager.preferLocaleFonts();
-     }
- 
-@@ -376,6 +379,9 @@
-      * @since 1.5
-      */
-     public void preferProportionalFonts() {
-+        if (!(this instanceof SunGraphicsEnvironment)) {
-+            return;
-+        }
-         sun.font.FontManager.preferProportionalFonts();
-     }
- 
-diff -r f68864fe53d3 -r 40ec164889bd test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java	Wed Dec 24 09:57:48 2008 -0800
-@@ -0,0 +1,62 @@
-+/*
-+ * Copyright (c) 2008 Sun Microsystems, Inc.  All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 6752638
-+ * @summary Test no NPE calling preferLocaleFonts() on custom GE.
-+ * @run main PreferLocaleFonts
-+ */
-+
-+import java.util.*;
-+import java.awt.*;
-+import java.awt.image.*;
-+
-+public class PreferLocaleFonts extends GraphicsEnvironment {
-+
-+    public static void main(String args[]) {
-+(new PreferLocaleFonts()).preferLocaleFonts();
-+    }
-+    public PreferLocaleFonts() {
-+        super();
-+    }
-+    public Graphics2D createGraphics(BufferedImage image) {
-+        return null;
-+    }
-+    public String[] getAvailableFontFamilyNames(Locale locale) {
-+        return null;
-+    }
-+    public String[] getAvailableFontFamilyNames() {
-+        return null;
-+    }
-+    public Font[] getAllFonts() {
-+        return null;
-+    }
-+    public GraphicsDevice getDefaultScreenDevice() throws HeadlessException {
-+        return null;
-+    }
-+    public GraphicsDevice[] getScreenDevices() throws HeadlessException {
-+        return null;
-+    }
-+}
-+