/hg/icedtea6-hg: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Aug 16 02:13:51 UTC 2016
changeset 2b2efb516e5a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2b2efb516e5a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 20:13:54 2016 +0100
PR3142: Don't assume system mime.types supports text/x-java-source
2016-07-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3142: Don't assume system mime.types
supports text/x-java-source
* Makefile.am:
(check-mimetype): Make second test depend
on JAVA_SOURCE_SUPPORTED conditional,
not MIME_TYPES_FILE_FOUND.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_MIME_TYPES): Check if the
system mime types file supports text/x-java-source.
changeset 1e3410fddbf8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1e3410fddbf8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Aug 16 02:57:43 2016 +0100
Merge
changeset d247f1787f04 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d247f1787f04
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Aug 16 03:15:54 2016 +0100
PR3143: Fix typo in --with-openjdk-src-dir introduced by PR3139
2016-08-15 Andrew John Hughes <gnu.andrew at redhat.com>
PR3143: Fix typo in --with-openjdk-src-dir
introduced by PR3139
* NEWS: Updated.
2010-07-23 Andrew John Hughes <gnu.andrew at redhat.com>
PR3143: Fix typo in --with-openjdk-src-dir
introduced by PR3139
* acinclude.m4:
(WITH_OPENJDK_SRC_DIR): Fix breakage in parameter caused
by previous configure help update.
diffstat:
ChangeLog | 46 ++++++
Makefile.am | 6 +-
NEWS | 2 +
acinclude.m4 | 15 +-
patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch | 97 --------------
patches/openjdk/7050826-pr2956-allow_type1_fonts.patch | 31 ----
6 files changed, 62 insertions(+), 135 deletions(-)
diffs (286 lines):
diff -r 6ea26782250d -r d247f1787f04 ChangeLog
--- a/ChangeLog Mon Aug 15 16:52:53 2016 +0100
+++ b/ChangeLog Tue Aug 16 03:15:54 2016 +0100
@@ -1,3 +1,30 @@
+2016-08-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR3143: Fix typo in --with-openjdk-src-dir
+ introduced by PR3139
+ * NEWS: Updated.
+
+2010-07-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR3143: Fix typo in --with-openjdk-src-dir
+ introduced by PR3139
+ * acinclude.m4:
+ (WITH_OPENJDK_SRC_DIR): Fix breakage in parameter caused
+ by previous configure help update.
+
+2016-07-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3142: Don't assume system mime.types
+ supports text/x-java-source
+ * Makefile.am:
+ (check-mimetype): Make second test depend
+ on JAVA_SOURCE_SUPPORTED conditional,
+ not MIME_TYPES_FILE_FOUND.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_MIME_TYPES): Check if the
+ system mime types file supports text/x-java-source.
+
2016-08-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3140: Pass $(CC) and $(CXX) to OpenJDK build
@@ -238,6 +265,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 at 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 at 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 at redhat.com>
PR2969: ENABLE_SYSTEM_LCMS is not defined
@@ -318,6 +359,11 @@
is now auto-generated and handled by autotools.
* NEWS: Updated.
+2016-05-08 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b40.
+
2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 6ea26782250d -r d247f1787f04 Makefile.am
--- a/Makefile.am Mon Aug 15 16:52:53 2016 +0100
+++ b/Makefile.am Tue Aug 16 03:15:54 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 \
@@ -2934,7 +2932,7 @@
exit -1; \
fi ; \
fi
-if MIME_TYPES_FILE_FOUND
+if JAVA_SOURCE_SUPPORTED
if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
expected="text/x-java-source" ; \
java=$$($(BUILD_SDK_DIR)/bin/java -cp $(MIME_TYPE_CHECK_BUILD_DIR) RH1195203 \
diff -r 6ea26782250d -r d247f1787f04 NEWS
--- a/NEWS Mon Aug 15 16:52:53 2016 +0100
+++ b/NEWS Tue Aug 16 03:15:54 2016 +0100
@@ -48,6 +48,8 @@
- PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order
- PR3139: Update documentation
- PR3140: Pass $(CC) and $(CXX) to OpenJDK build
+ - PR3142: Don't assume system mime.types supports text/x-java-source
+ - PR3143: Fix typo in --with-openjdk-src-dir introduced by PR3139
New in release 1.13.11 (2016-05-05):
diff -r 6ea26782250d -r d247f1787f04 acinclude.m4
--- a/acinclude.m4 Mon Aug 15 16:52:53 2016 +0100
+++ b/acinclude.m4 Tue Aug 16 03:15:54 2016 +0100
@@ -280,8 +280,8 @@
[
DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk
AC_MSG_CHECKING([for an OpenJDK source directory])
- AC_ARG_WITH([openjdk-src-dir=DIR],
- [AS_HELP_STRING([--with-openjdk-src-dir=PATH],specify the location of the OpenJDK source tree)],
+ AC_ARG_WITH([openjdk-src-dir],
+ [AS_HELP_STRING([--with-openjdk-src-dir=DIR],specify the location of the OpenJDK source tree)],
[
OPENJDK_SRC_DIR=${withval}
with_external_src_dir=true
@@ -2489,9 +2489,18 @@
mime_types_file_found=no
fi
AC_MSG_RESULT([$mime_types_file_found])
- if test "x${mime_types_file_found}" = "xno"; then
+ if test "x${mime_types_file_found}" = "xyes"; then
+ AC_MSG_CHECKING([if ${MIME_TYPES_FILE} has text/x-java-source])
+ if grep '^text/x-java-source' ${MIME_TYPES_FILE} >&AS_MESSAGE_LOG_FD ; then
+ java_source_supported=yes
+ else
+ java_source_supported=no
+ fi
+ AC_MSG_RESULT([$java_source_supported])
+ else
AC_MSG_WARN([No system MIME types file found.])
fi
AC_SUBST([MIME_TYPES_FILE])
AM_CONDITIONAL(MIME_TYPES_FILE_FOUND, test "x${mime_types_file_found}" = "xyes")
+ AM_CONDITIONAL(JAVA_SOURCE_SUPPORTED, test "x${java_source_supported}" = "xyes")
])
diff -r 6ea26782250d -r d247f1787f04 patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch
--- a/patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch Mon Aug 15 16:52:53 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;
-+ }
-+}
-+
diff -r 6ea26782250d -r d247f1787f04 patches/openjdk/7050826-pr2956-allow_type1_fonts.patch
--- a/patches/openjdk/7050826-pr2956-allow_type1_fonts.patch Mon Aug 15 16:52:53 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,
More information about the distro-pkg-dev
mailing list