/hg/icedtea6: fixed RH727195 : Japanese font mappings are broken

[jvanek at icedtea.classpath.org]

changeset dd68b47a153f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dd68b47a153f
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Oct 05 10:32:01 2011 +0200

	fixed RH727195 : Japanese font mappings are broken


diffstat:

 ChangeLog                |   7 +++++++
 NEWS                     |   1 +
 patches/fonts-rhel.patch |  11 ++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diffs (81 lines):

diff -r 23b9bb41de6d -r dd68b47a153f ChangeLog
--- a/ChangeLog	Mon Oct 03 16:35:35 2011 +0200
+++ b/ChangeLog	Wed Oct 05 10:32:01 2011 +0200
@@ -1,3 +1,10 @@
+2011-10-05  Jiri Vanek  <jvanek at redhat.com>
+
+	fixes rhbz#727195, based on martin.wilck at ts.fujitsu.com patch
+	*patches/fonts-rhel.patch: added maping to ipa-mincho font, which is then
+	used for all serif japanese fonts
+	* NEWS: Updated.
+
 2011-10-03  Xerxes RÃ¥nby  <xerxes at zafena.se>
 	    Robert Lougher <rob at jamvm.org.uk>
 
diff -r 23b9bb41de6d -r dd68b47a153f NEWS
--- a/NEWS	Mon Oct 03 16:35:35 2011 +0200
+++ b/NEWS	Wed Oct 05 10:32:01 2011 +0200
@@ -20,6 +20,7 @@
   - PR744: icedtea6-1.10.2 : patching error
   - PR752: ImageFormatException extends Exception not RuntimeException
   - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
+  - RH727195 : Japanese font mappings are broken
 * Import of OpenJDK6 b22 including upgrade to HotSpot 20
   - S7023111: Add webrev script to make/scripts
   - S6909331: Add vsvars.sh to the jdk repository (handy cygwin way to get vcvars32.bat run)
diff -r 23b9bb41de6d -r dd68b47a153f patches/fonts-rhel.patch
--- a/patches/fonts-rhel.patch	Mon Oct 03 16:35:35 2011 +0200
+++ b/patches/fonts-rhel.patch	Wed Oct 05 10:32:01 2011 +0200
@@ -13,7 +13,7 @@
  FONTCONFIGS_SRC	= $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs
 --- /dev/null	2010-12-20 09:26:08.850062021 +0100
 +++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.properties	2010-12-22 11:21:32.606781127 +0100
-@@ -0,0 +1,441 @@
+@@ -0,0 +1,442 @@
 +# 
 +# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -192,7 +192,7 @@
 +
 +serif.plain.latin-1=DejaVu Serif
 +#serif.plain.japanese-x0208=Sazanami Mincho
-+serif.plain.japanese-x0208=VL PGothic
++serif.plain.japanese-x0208=IPA Mincho
 +serif.plain.korean=Baekmuk Batang
 +serif.plain.chinese-big5=AR PL ZenKai Uni
 +serif.plain.chinese-gb18030=AR PL ZenKai Uni
@@ -210,7 +210,7 @@
 +
 +serif.bold.latin-1=DejaVu Serif Bold
 +#serif.bold.japanese-x0208=Sazanami Mincho
-+serif.bold.japanese-x0208=VL PGothic
++serif.bold.japanese-x0208=IPA Mincho
 +serif.bold.korean=Baekmuk Batang
 +serif.bold.chinese-big5=AR PL ZenKai Uni
 +serif.bold.chinese-gb18030=AR PL ZenKai Uni
@@ -228,7 +228,7 @@
 +
 +serif.italic.latin-1=DejaVu Serif Oblique
 +#serif.italic.japanese-x0208=Sazanami Mincho
-+serif.italic.japanese-x0208=VL PGothic
++serif.italic.japanese-x0208=IPA Mincho
 +serif.italic.korean=Baekmuk Batang
 +serif.italic.chinese-big5=AR PL ZenKai Uni
 +serif.italic.chinese-gb18030=AR PL ZenKai Uni
@@ -246,7 +246,7 @@
 +
 +serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
 +#serif.bolditalic.japanese-x0208=Sazanami Mincho
-+serif.bolditalic.japanese-x0208=VL PGothic
++serif.bolditalic.japanese-x0208=IPA Mincho
 +serif.bolditalic.korean=Baekmuk Batang
 +serif.bolditalic.chinese-big5=AR PL ZenKai Uni
 +serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
@@ -436,6 +436,7 @@
 +#filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf
 +filename.VL_Gothic=/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf
 +filename.VL_PGothic=/usr/share/fonts/svlgothic/VL-PGothic-Regular.ttf
++filename.IPA_Mincho=/usr/share/fonts/ipa-mincho/ipam.ttf
 +filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkuni-uming/uming.ttc
 +filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkuni-ukai/ukai.ttc
 +filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf/gulim.ttf