Mercurial > hg > icedtea6

changeset 3266:1e3410fddbf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 16 Aug 2016 02:57:43 +0100
parents 94ea67d446bc (diff) 2b2efb516e5a (current diff)
children d247f1787f04
files ChangeLog Makefile.am
diffstat 4 files changed, 20 insertions(+), 131 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 15 20:13:54 2016 +0100
+++ b/ChangeLog	Tue Aug 16 02:57:43 2016 +0100
@@ -251,6 +251,20 @@
 	* patches/pr3137-alt_button_order.patch:
 	New backports for issues to be fixed in 1.13.12.
 
+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:
+	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
@@ -331,6 +345,11 @@
 	is now auto-generated and handled by autotools.
 	* NEWS: Updated.
 
+2016-05-08  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_VERSION): Bump to next release, b40.
+
 2016-05-03  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Aug 15 20:13:54 2016 +0100
+++ b/Makefile.am	Tue Aug 16 02:57:43 2016 +0100
@@ -2,7 +2,7 @@
 
 OPENJDK_DATE = 03_may_2016
 OPENJDK_SHA256SUM = d11dc2ababe88e7891f1abbd7fa4fe033a65dea22c071331a641374b3247717f
-OPENJDK_VERSION = b39
+OPENJDK_VERSION = b40
 OPENJDK_URL = https://java.net/downloads/openjdk6/
 
 CACAO_VERSION = 68fe50ac34ec
@@ -458,7 +458,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 \
@@ -654,7 +653,6 @@
 	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/2178143-pr2959.patch \
 	patches/pr3137-alt_button_order.patch \
 	patches/openjdk/6260348-pr3068.patch \
--- a/patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch	Mon Aug 15 20:13:54 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;
-+    }
-+}
-+
--- a/patches/openjdk/7050826-pr2956-allow_type1_fonts.patch	Mon Aug 15 20:13:54 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,