/hg/icedtea6-hg: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Sep 30 03:53:20 PDT 2010
changeset 14ed93e7ecc5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=14ed93e7ecc5
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 11:10:01 2010 +0100
Add missing endif.
2010-09-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (extract-openjdk): Add missing endif.
changeset ab947d12cf61 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ab947d12cf61
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 11:53:10 2010 +0100
Merge
diffstat:
13 files changed, 64 insertions(+), 2340 deletions(-)
ChangeLog | 56
Makefile.am | 18
patches/icedtea-jtreg-jrunscript.patch | 12
patches/openjdk/4356282-opentype.patch | 227 ---
patches/openjdk/6438179-systray_check.patch | 92 -
patches/openjdk/6678385-window_movement_crasher.patch | 1241 -----------------
patches/openjdk/6721088-awt_window_size.patch | 67
patches/openjdk/6795060-icu_crash.patch | 95 -
patches/openjdk/6951319-sparc_build_fixes.patch | 24
patches/openjdk/6954424-opentype_javadoc.patch | 23
patches/openjdk/6961732-negative_leading.patch | 45
patches/openjdk/6969395-net_bugs.patch | 461 ------
patches/openjdk/6985992-test_6933784.patch | 43
diffs (truncated from 2599 to 500 lines):
diff -r 48029753c45f -r ab947d12cf61 ChangeLog
--- a/ChangeLog Thu Sep 30 10:33:22 2010 +0100
+++ b/ChangeLog Thu Sep 30 11:53:10 2010 +0100
@@ -1,3 +1,8 @@ 2010-09-29 Andrew John Hughes <ahughes
+2010-09-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (extract-openjdk): Add missing endif.
+
2010-09-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
@@ -64,6 +69,14 @@ 2010-09-23 Andrew John Hughes <ahughes
* Makefile.am: Fix path of above patch.
* patches/openjdk/6721088-awt_window_size.patch,
...here to reflect upstreaming.
+
+2010-09-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-awt-window-size.patch,
+ * patches/openjdk/6969395-net_bugs.patch,
+ * patches/openjdk/6985992-test_6933784.patch:
+ Dropped; upstreamed.
+ * Makefile.am: Remove above patches.
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
@@ -404,6 +417,15 @@ 2010-09-07 Andrew John Hughes <ahughes
* patches/openjdk/6969395-net_bugs.patch:
Fix networking tests.
+2010-09-05 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6438179-systray_check.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Drop above patch and those brought
+ back by merge. Update JAXP tarball.
+ * patches/openjdk/6951319-sparc_build_fixes.patch:
+ Remove upstreamed parts.
+
2010-09-03 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: Fixed indentation, changes spaces to tab.
@@ -453,7 +475,7 @@ 2010-08-27 Deepak Bhole <dbhole at redhat.
2010-08-26 Pavel Tisnovsky <ptisnovs at redhat.com>
- * Makefile.am:
+ * Makefile.am: Add patch.
* patches/opengl-jni-fix.patch:
Fixed missing JNI link to native function
OGLContext.getOGLIdString() which causes
@@ -540,6 +562,22 @@ 2010-08-13 Andrew John Hughes <ahughes
an Oracle-based JDK or not.
* configure.ac:
Remove check for sun.awt.Toolkit.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/4356282-opentype.patch,
+ * patches/openjdk/6795060-icu_crash.patch,
+ * patches/openjdk/6954424-opentype_javadoc.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patches.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6678385-window_movement_crasher.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patch.
2010-08-09 Omair Majid <omajid at redhat.com>
@@ -581,7 +619,7 @@ 2010-08-09 Deepak Bhole <dbhole at redhat.
* Makefile.am:
(icedtea):Add update-bootclasspath.patch.
dependencies and copying. Add icedtea-update-bootclasspath.patch.
- * patches/update-bootclasspath.patch: New patch. Adds netx,
+ * patches/update-bootclasspath.patch: New patch. Adds netx,
rhino and plugin jars to the bootclasspath.
2010-08-09 Andrew John Hughes <ahughes at redhat.com>
@@ -893,6 +931,12 @@ 2010-07-28 Matthias Klose <doko at ubuntu
2010-07-28 Matthias Klose <doko at ubuntu.com>
* NEWS: Add 1.8.1 entry.
+
+2010-07-26 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-jtreg-jrunscript.patch:
+ Regenerate after 50002bfcff96 from dcubed being
+ added to OpenJDK6.
2010-07-26 Andrew John Hughes <ahughes at redhat.com>
@@ -1342,6 +1386,12 @@ 2010-07-08 Andrew John Hughes <ahughes
just delete the stamp.
(clean-extract-openjdk): Likewise for clean-patch and
clean-patch-fsg.
+
+2010-07-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6961732.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Remove above patch.
2010-07-06 Andrew John Hughes <ahughes at redhat.com>
@@ -9635,7 +9685,7 @@ 2009-04-07 Omair Majid <omajid at redhat.
2009-04-06 Omair Majid <omajid at redhat.com>
- * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
+ * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
jrunscriptTest.sh with a java version that isnt picky about int vs double
changes.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
diff -r 48029753c45f -r ab947d12cf61 Makefile.am
--- a/Makefile.am Thu Sep 30 10:33:22 2010 +0100
+++ b/Makefile.am Thu Sep 30 11:53:10 2010 +0100
@@ -17,9 +17,9 @@ JAF_DROP_URL = https://jax-ws.dev.java.n
JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648
-JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/152561
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
@@ -247,7 +247,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-demo-swingapplet.patch \
- patches/openjdk/6721088-awt_window_size.patch \
patches/icedtea-jtreg-6592792.patch \
patches/icedtea-s390-noinline.patch \
patches/icedtea-jtreg-dnd.patch \
@@ -269,8 +268,6 @@ ICEDTEA_PATCHES = \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
- patches/openjdk/6678385-window_movement_crasher.patch \
- patches/openjdk/6961732-negative_leading.patch \
patches/debug-dir.patch \
patches/no-sync.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -280,19 +277,13 @@ ICEDTEA_PATCHES = \
patches/fonts-rhel.patch \
patches/fonts-gentoo.patch \
patches/ipv4-mapped-ipv6-addresses.patch \
- patches/openjdk/6795060-icu_crash.patch \
- patches/openjdk/4356282-opentype.patch \
- patches/openjdk/6954424-opentype_javadoc.patch \
- patches/openjdk/6438179-systray_check.patch \
patches/icedtea-too-many-args.patch \
patches/icedtea-jtreg-OpenGLContextInit.patch \
- patches/openjdk/6969395-net_bugs.patch \
patches/openjdk/6510892-httpserver_test.patch \
patches/openjdk/6638712-wildcard_types.patch \
patches/openjdk/6650759-missing_inference.patch \
patches/numa_on_early_glibc.patch \
- patches/icedtea-shark-build.patch \
- patches/openjdk/6985992-test_6933784.patch
+ patches/icedtea-shark-build.patch
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -838,6 +829,7 @@ else
chmod -R ug+w openjdk ; \
sh $(abs_top_srcdir)/fsg.sh ; \
fi
+endif
endif
mkdir -p stamps
touch stamps/extract-openjdk.stamp
diff -r 48029753c45f -r ab947d12cf61 patches/icedtea-jtreg-jrunscript.patch
--- a/patches/icedtea-jtreg-jrunscript.patch Thu Sep 30 10:33:22 2010 +0100
+++ b/patches/icedtea-jtreg-jrunscript.patch Thu Sep 30 11:53:10 2010 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/test/sun/tool
diff -Nru openjdk.orig/jdk/test/sun/tools/jrunscript/CheckEngine.java openjdk/jdk/test/sun/tools/jrunscript/CheckEngine.java
--- openjdk.orig/jdk/test/sun/tools/jrunscript/CheckEngine.java 2010-05-26 09:33:18.000000000 +0100
-+++ openjdk/jdk/test/sun/tools/jrunscript/CheckEngine.java 2010-05-26 14:08:25.000000000 +0100
++++ openjdk/jdk/test/sun/tools/jrunscript/CheckEngine.java 2010-07-28 12:43:18.282489286 +0100
@@ -39,7 +39,8 @@
* passed.
*/
@@ -25,13 +25,13 @@ diff -Nru openjdk.orig/jdk/test/sun/tool
}
}
diff -Nru openjdk.orig/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh openjdk/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
---- openjdk.orig/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh 2010-05-26 09:33:18.000000000 +0100
+--- openjdk.orig/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh 2010-07-28 11:14:05.000000000 +0100
+++ openjdk/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-#
--# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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
@@ -79,7 +79,7 @@ diff -Nru openjdk.orig/jdk/test/sun/tool
-new java.lang.Runnable() { run: function() { println('I am runnable'); }}.run();
-EOF
-
--diff jrunscriptTest.out ${TESTSRC}/repl.out
+-$golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
-if [ $? != 0 ]
-then
- echo "Output of jrunscript session differ from expected output. Failed."
@@ -97,7 +97,7 @@ diff -Nru openjdk.orig/jdk/test/sun/tool
-new java.lang.Runnable() { run: function() { println('I am runnable'); }}.run();
-EOF
-
--diff jrunscriptTest.out ${TESTSRC}/repl.out
+-$golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
-if [ $? != 0 ]
-then
- echo "Output of jrunscript -l js differ from expected output. Failed."
@@ -110,7 +110,7 @@ diff -Nru openjdk.orig/jdk/test/sun/tool
-exit 0
diff -Nru openjdk.orig/jdk/test/sun/tools/jrunscript/Testjrunscript.java openjdk/jdk/test/sun/tools/jrunscript/Testjrunscript.java
--- openjdk.orig/jdk/test/sun/tools/jrunscript/Testjrunscript.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/test/sun/tools/jrunscript/Testjrunscript.java 2010-05-26 14:08:25.000000000 +0100
++++ openjdk/jdk/test/sun/tools/jrunscript/Testjrunscript.java 2010-07-28 12:43:18.282489286 +0100
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2009 Red Hat, Inc. All Rights Reserved.
diff -r 48029753c45f -r ab947d12cf61 patches/openjdk/4356282-opentype.patch
--- a/patches/openjdk/4356282-opentype.patch Thu Sep 30 10:33:22 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-
-# HG changeset patch
-# User igor
-# Date 1217861443 -14400
-# Node ID b577c70564b8053092bf35f012fa29efe22f56c9
-# Parent 2b1a7d4b9ac69c2366f38b5b0e9ebcf61f1e3277
-4356282: RFE: T2K should be used to rasterize CID/CFF fonts
-Reviewed-by: bae, prr
-
---- openjdk.orig/jdk/src/share/classes/sun/font/FontManager.java Fri Jun 25 11:53:15 2010 -0700
-+++ openjdk/jdk/src/share/classes/sun/font/FontManager.java Mon Aug 04 18:50:43 2008 +0400
-@@ -3269,7 +3269,7 @@ public final class FontManager {
- int fontFormat = FONTFORMAT_NONE;
- int fontRank = Font2D.UNKNOWN_RANK;
-
-- if (ext.equals(".ttf") || isTTC) {
-+ if (ext.equals(".ttf") || ext.equals(".otf") || isTTC) {
- fontFormat = FONTFORMAT_TRUETYPE;
- fontRank = Font2D.TTF_RANK;
- } else if (ext.equals(".pfa") || ext.equals(".pfb")) {
---- openjdk.orig/jdk/src/share/classes/sun/font/TrueTypeFont.java Fri Jun 25 11:53:15 2010 -0700
-+++ openjdk/jdk/src/share/classes/sun/font/TrueTypeFont.java Mon Aug 04 18:50:43 2008 +0400
-@@ -90,6 +90,7 @@ public class TrueTypeFont extends FileFo
- public static final int ttcfTag = 0x74746366; // 'ttcf' - TTC file
- public static final int v1ttTag = 0x00010000; // 'v1tt' - Version 1 TT font
- public static final int trueTag = 0x74727565; // 'true' - Version 2 TT font
-+ public static final int ottoTag = 0x4f54544f; // 'otto' - OpenType font
-
- /* -- ID's used in the 'name' table */
- public static final int MS_PLATFORM_ID = 3;
-@@ -499,6 +500,7 @@ public class TrueTypeFont extends FileFo
-
- case v1ttTag:
- case trueTag:
-+ case ottoTag:
- break;
-
- default:
---- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java Fri Jun 25 11:53:15 2010 -0700
-+++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java Mon Aug 04 18:50:43 2008 +0400
-@@ -792,7 +792,9 @@ public abstract class SunGraphicsEnviron
- return(name.startsWith(".ttf", offset) ||
- name.startsWith(".TTF", offset) ||
- name.startsWith(".ttc", offset) ||
-- name.startsWith(".TTC", offset));
-+ name.startsWith(".TTC", offset) ||
-+ name.startsWith(".otf", offset) ||
-+ name.startsWith(".OTF", offset));
- }
- }
- }
-@@ -815,31 +817,11 @@ public abstract class SunGraphicsEnviron
- }
- }
-
-- public static class TTorT1Filter implements FilenameFilter {
-- public boolean accept(File dir, String name) {
--
-- /* all conveniently have the same suffix length */
-- int offset = name.length()-4;
-- if (offset <= 0) { /* must be at least A.ttf or A.pfa */
-- return false;
-- } else {
-- boolean isTT =
-- name.startsWith(".ttf", offset) ||
-- name.startsWith(".TTF", offset) ||
-- name.startsWith(".ttc", offset) ||
-- name.startsWith(".TTC", offset);
-- if (isTT) {
-- return true;
-- } else if (noType1Font) {
-- return false;
-- } else {
-- return(name.startsWith(".pfa", offset) ||
-- name.startsWith(".pfb", offset) ||
-- name.startsWith(".PFA", offset) ||
-- name.startsWith(".PFB", offset));
-- }
-- }
-- }
-+ public static class TTorT1Filter implements FilenameFilter {
-+ public boolean accept(File dir, String name) {
-+ return SunGraphicsEnvironment.ttFilter.accept(dir, name) ||
-+ SunGraphicsEnvironment.t1Filter.accept(dir, name);
-+ }
- }
-
- /* No need to keep consing up new instances - reuse a singleton.
---- openjdk.orig/jdk/src/windows/native/sun/font/fontpath.c Fri Jun 25 11:53:15 2010 -0700
-+++ openjdk/jdk/src/windows/native/sun/font/fontpath.c Mon Aug 04 18:50:43 2008 +0400
-@@ -153,7 +153,8 @@ static int CALLBACK EnumFontFacesInFamil
- JNIEnv *env = fmi->env;
- jstring fullname, fullnameLC;
-
-- if (FontType != TRUETYPE_FONTTYPE) {
-+ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */
-+ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) {
- return 1;
- }
-
-@@ -227,7 +228,8 @@ static int CALLBACK EnumFontFacesInFamil
- JNIEnv *env = fmi->env;
- jstring fullname, fullnameLC;
-
-- if (FontType != TRUETYPE_FONTTYPE) {
-+ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */
-+ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) {
- return 1;
- }
-
-@@ -274,7 +276,8 @@ static int CALLBACK EnumFamilyNamesA(
- jstring familyLC;
- LOGFONTA lfa;
-
-- if (FontType != TRUETYPE_FONTTYPE) {
-+ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */
-+ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) {
- return 1;
- }
-
-@@ -323,7 +326,8 @@ static int CALLBACK EnumFamilyNamesW(
- int slen;
- LOGFONTW lfw;
-
-- if (FontType != TRUETYPE_FONTTYPE) {
-+ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */
-+ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) {
- return 1;
- }
- /* wprintf(L"FAMILY=%s charset=%d FULL=%s\n", */
-@@ -383,15 +387,16 @@ static int CALLBACK EnumFamilyNamesW(
- * Also if a Font has a name for this locale that name also
- * exists in the registry using the appropriate platform encoding.
- * What do we do then?
-- */
--
--/* static const wchar_t W_TTSUFFIX[] = L" (TrueType)"; */
--/* static const char C_TTSUFFIX[] = " (TrueType)"; */
--/* static int TTSLEN = 11; hard-coded - be careful */
--static BOOL RegistryToBaseTTNameA(LPCSTR name) {
-+ *
-+ * Note: OpenType fonts seems to have " (TrueType)" suffix on Vista
-+ * but " (OpenType)" on XP.
-+ */
-+
-+static BOOL RegistryToBaseTTNameA(LPSTR name) {
- static const char TTSUFFIX[] = " (TrueType)";
-+ static const char OTSUFFIX[] = " (OpenType)";
- int TTSLEN = strlen(TTSUFFIX);
-- char *match;
-+ char *suffix;
-
- int len = strlen(name);
- if (len == 0) {
-@@ -403,19 +408,21 @@ static BOOL RegistryToBaseTTNameA(LPCSTR
- if (len <= TTSLEN) {
- return FALSE;
- }
-- match = strstr(name, TTSUFFIX);
-- if ((match != NULL) && (match == name+(len-TTSLEN))) {
-- match[0] = '\0'; /* truncate name */
-+
-+ /* suffix length is the same for truetype and opentype fonts */
-+ suffix = name + len - TTSLEN;
-+ if (strcmp(suffix, TTSUFFIX) == 0 || strcmp(suffix, OTSUFFIX) == 0) {
-+ suffix[0] = '\0'; /* truncate name */
- return TRUE;
-- } else {
-- return FALSE;
-- }
-+ }
-+ return FALSE;
- }
-
- static BOOL RegistryToBaseTTNameW(LPWSTR name) {
- static const wchar_t TTSUFFIX[] = L" (TrueType)";
-+ static const wchar_t OTSUFFIX[] = L" (OpenType)";
- int TTSLEN = wcslen(TTSUFFIX);
-- wchar_t *match;
-+ wchar_t *suffix;
-
- int len = wcslen(name);
- if (len == 0) {
-@@ -427,13 +434,13 @@ static BOOL RegistryToBaseTTNameW(LPWSTR
- if (len <= TTSLEN) {
- return FALSE;
- }
-- match = wcsstr(name, TTSUFFIX);
-- if ((match != NULL) && (match == name+(len-TTSLEN))) {
-- match[0] = L'\0'; /* truncate name */
-+ /* suffix length is the same for truetype and opentype fonts */
-+ suffix = name + (len - TTSLEN);
-+ if (wcscmp(suffix, TTSUFFIX) == 0 || wcscmp(suffix, OTSUFFIX) == 0) {
-+ suffix[0] = L'\0'; /* truncate name */
- return TRUE;
-- } else {
-- return FALSE;
-- }
-+ }
-+ return FALSE;
- }
-
- static void registerFontA(GdiFontMapInfo *fmi, jobject fontToFileMap,
-@@ -675,18 +682,19 @@ Java_sun_font_FontManager_populateFontFi
- }
- if (IS_NT) {
- if (!RegistryToBaseTTNameW((LPWSTR)wname) ) {
-- /* If the filename ends with ".ttf" also accept it.
-+ /* If the filename ends with ".ttf" or ".otf" also accept it.
- * Not expecting to need to do this for .ttc files.
- * Also note this code is not mirrored in the "A" (win9x) path.
- */
- LPWSTR dot = wcsrchr((LPWSTR)data, L'.');
-- if (dot == NULL || (wcsicmp(dot, L".ttf") != 0)) {
-+ if (dot == NULL || ((wcsicmp(dot, L".ttf") != 0)
-+ && (wcsicmp(dot, L".otf") != 0))) {
- continue; /* not a TT font... */
- }
- }
- registerFontW(&fmi, fontToFileMap, (LPWSTR)wname, (LPWSTR)data);
- } else {
-- if (!RegistryToBaseTTNameA(cname) ) {
-+ if (!RegistryToBaseTTNameA((LPSTR)cname)) {
- continue; /* not a TT font... */
- }
- registerFontA(&fmi, fontToFileMap, cname, (LPCSTR)data);
-
diff -r 48029753c45f -r ab947d12cf61 patches/openjdk/6438179-systray_check.patch
--- a/patches/openjdk/6438179-systray_check.patch Thu Sep 30 10:33:22 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-# HG changeset patch
-# User omajid
-# Date 1281710168 14400
-# Node ID ac23e40d3880c30085d7a76826145afbe73dd465
-# Parent 636250081b3b27e4b9f536903aa2ddad135f24f2
-6438179: XToolkit.isTraySupported() result has nothing to do with the system tray
-Summary: Use System Tray Protocol Specification
-Reviewed-by: prr, dcherepanov
-
---- openjdk.orig/jdk/src/share/classes/java/awt/SystemTray.java Wed Aug 11 19:06:15 2010 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/SystemTray.java Fri Aug 13 10:36:08 2010 -0400
-@@ -164,16 +164,14 @@ public class SystemTray {
- if (GraphicsEnvironment.isHeadless()) {
- throw new HeadlessException();
- }
-+
-+ initializeSystemTrayIfNeeded();
-+
- if (!isSupported()) {
- throw new UnsupportedOperationException(
- "The system tray is not supported on the current platform.");
- }
-
-- synchronized (SystemTray.class) {
-- if (systemTray == null) {
-- systemTray = new SystemTray();
-- }
-- }
- return systemTray;
- }
More information about the distro-pkg-dev
mailing list