Mercurial > hg > release > icedtea6-1.9
changeset 2277:41d310123556
Updating fontconfig files for Fedoras 9-14
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Wed, 10 Nov 2010 16:28:47 +0100 |
parents | 4b9b1ece4ede |
children | 17c34c4c6fae |
files | ChangeLog Makefile.am patches/f14-fonts.patch |
diffstat | 3 files changed, 703 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 10 16:05:51 2010 +0000 +++ b/ChangeLog Wed Nov 10 16:28:47 2010 +0100 @@ -1,3 +1,15 @@ +2010-11-10 Jiri Vanek <jvanek@redhat.com> + + * Makefile.am: + (FONTCONFIG_PATH): Added path to fontconfig files. + (ICEDTEA_PATCHES): Add f14-fonts.patch. + (fonts): Added cloning of fontconfig.Fedora + to Fedora.12,11,10,9. + (patch-fsg): Depend on fonts.stamp. + * patches/f14-fonts.patch + Updated font configurations for Fedora 9-14 + Add additional fontconfig files to Makefile. + 2010-11-10 Andrew John Hughes <ahughes@redhat.com> RH647737
--- a/Makefile.am Wed Nov 10 16:05:51 2010 +0000 +++ b/Makefile.am Wed Nov 10 16:28:47 2010 +0100 @@ -41,6 +41,8 @@ SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) +FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs + # Source directories @@ -315,7 +317,8 @@ patches/6703377-freetypescaler.patch \ patches/openjdk/6622432-bigdecimal_performance.patch \ patches/openjdk/6850606-bigdecimal_regression.patch \ - patches/openjdk/6876282-bigdecimal_divide.patch + patches/openjdk/6876282-bigdecimal_divide.patch \ + patches/f14-fonts.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -965,7 +968,16 @@ fi rm -f stamps/generated.stamp -stamps/patch-fsg.stamp: stamps/generated.stamp +stamps/fonts.stamp: stamps/generated.stamp + cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.9.properties + cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.10.properties + cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.11.properties + cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.12.properties + mkdir -p stamps + touch stamps/fonts.stamp + + +stamps/patch-fsg.stamp: stamps/fonts.stamp mkdir -p stamps ; \ rm -f stamps/patch-fsg.stamp.tmp ; \ touch stamps/patch-fsg.stamp.tmp ; \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/f14-fonts.patch Wed Nov 10 16:28:47 2010 +0100 @@ -0,0 +1,677 @@ +--- openjdk/jdk/make/sun/awt/Makefile 2010-11-04 09:52:49.583434000 +0100 ++++ openjdk/jdk/make/sun/awt/Makefile 2010-11-04 16:50:14.091688769 +0100 +@@ -387,6 +387,10 @@ + fontconfig.SuSE.properties \ + fontconfig.Ubuntu.properties \ + fontconfig.Fedora.properties \ ++ fontconfig.Fedora.9.properties \ ++ fontconfig.Fedora.10.properties \ ++ fontconfig.Fedora.11.properties \ ++ fontconfig.Fedora.12.properties \ + fontconfig.RedHat.6.0.properties \ + fontconfig.Gentoo.properties + else + +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties 2010-11-04 11:06:26.695428114 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties 2010-11-04 11:19:45.133587953 +0100 +@@ -35,6 +35,8 @@ + dialog.plain.korean=Baekmuk Gulim + dialog.plain.chinese-big5=AR PL ShanHeiSun Uni + dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.plain.assamese=Lohit Assamese ++dialog.plain.devanagari=Lohit Devanagari + dialog.plain.bengali=Lohit Bengali + dialog.plain.gujarati=Lohit Gujarati + dialog.plain.hindi=Lohit Hindi +@@ -50,6 +52,8 @@ + dialog.bold.korean=Baekmuk Gulim + dialog.bold.chinese-big5=AR PL ShanHeiSun Uni + dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bold.assamese=Lohit Assamese ++dialog.bold.devanagari=Lohit Devanagari + dialog.bold.bengali=Lohit Bengali + dialog.bold.gujarati=Lohit Gujarati + dialog.bold.hindi=Lohit Hindi +@@ -65,6 +69,8 @@ + dialog.italic.korean=Baekmuk Gulim + dialog.italic.chinese-big5=AR PL ShanHeiSun Uni + dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.italic.assamese=Lohit Assamese ++dialog.italic.devanagari=Lohit Devanagari + dialog.italic.bengali=Lohit Bengali + dialog.italic.gujarati=Lohit Gujarati + dialog.italic.hindi=Lohit Hindi +@@ -80,6 +86,8 @@ + dialog.bolditalic.korean=Baekmuk Gulim + dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bolditalic.assamese=Lohit Assamese ++dialog.bolditalic.devanagari=Lohit Devanagari + dialog.bolditalic.bengali=Lohit Bengali + dialog.bolditalic.gujarati=Lohit Gujarati + dialog.bolditalic.hindi=Lohit Hindi +@@ -95,6 +103,8 @@ + sansserif.plain.korean=Baekmuk Gulim + sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni + sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.plain.assamese=Lohit Assamese ++sansserif.plain.devanagari=Lohit Devanagari + sansserif.plain.bengali=Lohit Bengali + sansserif.plain.gujarati=Lohit Gujarati + sansserif.plain.hindi=Lohit Hindi +@@ -110,6 +120,8 @@ + sansserif.bold.korean=Baekmuk Gulim + sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bold.assamese=Lohit Assamese ++sansserif.bold.devanagari=Lohit Devanagari + sansserif.bold.bengali=Lohit Bengali + sansserif.bold.gujarati=Lohit Gujarati + sansserif.bold.hindi=Lohit Hindi +@@ -125,6 +137,8 @@ + sansserif.italic.korean=Baekmuk Gulim + sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.italic.assamese=Lohit Assamese ++sansserif.italic.devanagari=Lohit Devanagari + sansserif.italic.bengali=Lohit Bengali + sansserif.italic.gujarati=Lohit Gujarati + sansserif.italic.hindi=Lohit Hindi +@@ -140,6 +154,8 @@ + sansserif.bolditalic.korean=Baekmuk Gulim + sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bolditalic.assamese=Lohit Assamese ++sansserif.bolditalic.devanagari=Lohit Devanagari + sansserif.bolditalic.bengali=Lohit Bengali + sansserif.bolditalic.gujarati=Lohit Gujarati + sansserif.bolditalic.hindi=Lohit Hindi +@@ -155,6 +171,8 @@ + serif.plain.korean=Baekmuk Batang + serif.plain.chinese-big5=AR PL ZenKai Uni + serif.plain.chinese-gb18030=AR PL ZenKai Uni ++serif.plain.assamese=Lohit Assamese ++serif.plain.devanagari=Lohit Devanagari + serif.plain.bengali=Lohit Bengali + serif.plain.gujarati=Lohit Gujarati + serif.plain.hindi=Lohit Hindi +@@ -170,6 +188,8 @@ + serif.bold.korean=Baekmuk Batang + serif.bold.chinese-big5=AR PL ZenKai Uni + serif.bold.chinese-gb18030=AR PL ZenKai Uni ++serif.bold.assamese=Lohit Assamese ++serif.bold.devanagari=Lohit Devanagari + serif.bold.bengali=Lohit Bengali + serif.bold.gujarati=Lohit Gujarati + serif.bold.hindi=Lohit Hindi +@@ -185,6 +205,8 @@ + serif.italic.korean=Baekmuk Batang + serif.italic.chinese-big5=AR PL ZenKai Uni + serif.italic.chinese-gb18030=AR PL ZenKai Uni ++serif.italic.assamese=Lohit Assamese ++serif.italic.devanagari=Lohit Devanagari + serif.italic.bengali=Lohit Bengali + serif.italic.gujarati=Lohit Gujarati + serif.italic.hindi=Lohit Hindi +@@ -200,6 +222,8 @@ + serif.bolditalic.korean=Baekmuk Batang + serif.bolditalic.chinese-big5=AR PL ZenKai Uni + serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni ++serif.bolditalic.assamese=Lohit Assamese ++serif.bolditalic.devanagari=Lohit Devanagari + serif.bolditalic.bengali=Lohit Bengali + serif.bolditalic.gujarati=Lohit Gujarati + serif.bolditalic.hindi=Lohit Hindi +@@ -215,6 +239,8 @@ + monospaced.plain.korean=Baekmuk Gulim + monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni + monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.plain.assamese=Lohit Assamese ++monospaced.plain.devanagari=Lohit Devanagari + monospaced.plain.bengali=Lohit Bengali + monospaced.plain.gujarati=Lohit Gujarati + monospaced.plain.hindi=Lohit Hindi +@@ -230,6 +256,8 @@ + monospaced.bold.korean=Baekmuk Gulim + monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bold.assamese=Lohit Assamese ++monospaced.bold.devanagari=Lohit Devanagari + monospaced.bold.bengali=Lohit Bengali + monospaced.bold.gujarati=Lohit Gujarati + monospaced.bold.hindi=Lohit Hindi +@@ -245,6 +273,8 @@ + monospaced.italic.korean=Baekmuk Gulim + monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.italic.assamese=Lohit Assamese ++monospaced.italic.devanagari=Lohit Devanagari + monospaced.italic.bengali=Lohit Bengali + monospaced.italic.gujarati=Lohit Gujarati + monospaced.italic.hindi=Lohit Hindi +@@ -260,6 +290,8 @@ + monospaced.bolditalic.korean=Baekmuk Gulim + monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bolditalic.assamese=Lohit Assamese ++monospaced.bolditalic.devanagari=Lohit Devanagari + monospaced.bolditalic.bengali=Lohit Bengali + monospaced.bolditalic.gujarati=Lohit Gujarati + monospaced.bolditalic.hindi=Lohit Hindi +@@ -275,6 +307,8 @@ + dialoginput.plain.korean=Baekmuk Gulim + dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.plain.assamese=Lohit Assamese ++dialoginput.plain.devanagari=Lohit Devanagari + dialoginput.plain.bengali=Lohit Bengali + dialoginput.plain.gujarati=Lohit Gujarati + dialoginput.plain.hindi=Lohit Hindi +@@ -290,6 +324,8 @@ + dialoginput.bold.korean=Baekmuk Gulim + dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bold.assamese=Lohit Assamese ++dialoginput.bold.devanagari=Lohit Devanagari + dialoginput.bold.bengali=Lohit Bengali + dialoginput.bold.gujarati=Lohit Gujarati + dialoginput.bold.hindi=Lohit Hindi +@@ -305,6 +341,8 @@ + dialoginput.italic.korean=Baekmuk Gulim + dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.italic.assamese=Lohit Assamese ++dialoginput.italic.devanagari=Lohit Devanagari + dialoginput.italic.bengali=Lohit Bengali + dialoginput.italic.gujarati=Lohit Gujarati + dialoginput.italic.hindi=Lohit Hindi +@@ -320,6 +358,8 @@ + dialoginput.bolditalic.korean=Baekmuk Gulim + dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bolditalic.assamese=Lohit Assamese ++dialoginput.bolditalic.devanagari=Lohit Devanagari + dialoginput.bolditalic.bengali=Lohit Bengali + dialoginput.bolditalic.gujarati=Lohit Gujarati + dialoginput.bolditalic.hindi=Lohit Hindi +@@ -356,21 +396,24 @@ + filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf + filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf + +-filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf + filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc + filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc +-filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf/gulim.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf/batang.ttf ++ ++filename.Lohit_Assamese=/usr/share/fonts/lohit-assamese/Lohit-Assamese.ttf ++filename.Lohit_Devanagari=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf ++filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/Lohit-Bengali.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf ++filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/Lohit-Hindi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf ++filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/Lohit-Malayalam.ttf ++filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/Lohit-Oriya.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/Lohit-Punjabi.ttf ++filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf ++filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/Lohit-Telugu.ttf + +-filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf +-filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf + filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf + + +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties 2010-11-04 11:06:26.695428114 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties 2010-11-04 11:19:45.133587953 +0100 +@@ -35,6 +35,8 @@ + dialog.plain.korean=Baekmuk Gulim + dialog.plain.chinese-big5=AR PL ShanHeiSun Uni + dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.plain.assamese=Lohit Assamese ++dialog.plain.devanagari=Lohit Devanagari + dialog.plain.bengali=Lohit Bengali + dialog.plain.gujarati=Lohit Gujarati + dialog.plain.hindi=Lohit Hindi +@@ -50,6 +52,8 @@ + dialog.bold.korean=Baekmuk Gulim + dialog.bold.chinese-big5=AR PL ShanHeiSun Uni + dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bold.assamese=Lohit Assamese ++dialog.bold.devanagari=Lohit Devanagari + dialog.bold.bengali=Lohit Bengali + dialog.bold.gujarati=Lohit Gujarati + dialog.bold.hindi=Lohit Hindi +@@ -65,6 +69,8 @@ + dialog.italic.korean=Baekmuk Gulim + dialog.italic.chinese-big5=AR PL ShanHeiSun Uni + dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.italic.assamese=Lohit Assamese ++dialog.italic.devanagari=Lohit Devanagari + dialog.italic.bengali=Lohit Bengali + dialog.italic.gujarati=Lohit Gujarati + dialog.italic.hindi=Lohit Hindi +@@ -80,6 +86,8 @@ + dialog.bolditalic.korean=Baekmuk Gulim + dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bolditalic.assamese=Lohit Assamese ++dialog.bolditalic.devanagari=Lohit Devanagari + dialog.bolditalic.bengali=Lohit Bengali + dialog.bolditalic.gujarati=Lohit Gujarati + dialog.bolditalic.hindi=Lohit Hindi +@@ -95,6 +103,8 @@ + sansserif.plain.korean=Baekmuk Gulim + sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni + sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.plain.assamese=Lohit Assamese ++sansserif.plain.devanagari=Lohit Devanagari + sansserif.plain.bengali=Lohit Bengali + sansserif.plain.gujarati=Lohit Gujarati + sansserif.plain.hindi=Lohit Hindi +@@ -110,6 +120,8 @@ + sansserif.bold.korean=Baekmuk Gulim + sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bold.assamese=Lohit Assamese ++sansserif.bold.devanagari=Lohit Devanagari + sansserif.bold.bengali=Lohit Bengali + sansserif.bold.gujarati=Lohit Gujarati + sansserif.bold.hindi=Lohit Hindi +@@ -125,6 +137,8 @@ + sansserif.italic.korean=Baekmuk Gulim + sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.italic.assamese=Lohit Assamese ++sansserif.italic.devanagari=Lohit Devanagari + sansserif.italic.bengali=Lohit Bengali + sansserif.italic.gujarati=Lohit Gujarati + sansserif.italic.hindi=Lohit Hindi +@@ -140,6 +154,8 @@ + sansserif.bolditalic.korean=Baekmuk Gulim + sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bolditalic.assamese=Lohit Assamese ++sansserif.bolditalic.devanagari=Lohit Devanagari + sansserif.bolditalic.bengali=Lohit Bengali + sansserif.bolditalic.gujarati=Lohit Gujarati + sansserif.bolditalic.hindi=Lohit Hindi +@@ -155,6 +171,8 @@ + serif.plain.korean=Baekmuk Batang + serif.plain.chinese-big5=AR PL ZenKai Uni + serif.plain.chinese-gb18030=AR PL ZenKai Uni ++serif.plain.assamese=Lohit Assamese ++serif.plain.devanagari=Lohit Devanagari + serif.plain.bengali=Lohit Bengali + serif.plain.gujarati=Lohit Gujarati + serif.plain.hindi=Lohit Hindi +@@ -170,6 +188,8 @@ + serif.bold.korean=Baekmuk Batang + serif.bold.chinese-big5=AR PL ZenKai Uni + serif.bold.chinese-gb18030=AR PL ZenKai Uni ++serif.bold.assamese=Lohit Assamese ++serif.bold.devanagari=Lohit Devanagari + serif.bold.bengali=Lohit Bengali + serif.bold.gujarati=Lohit Gujarati + serif.bold.hindi=Lohit Hindi +@@ -185,6 +205,8 @@ + serif.italic.korean=Baekmuk Batang + serif.italic.chinese-big5=AR PL ZenKai Uni + serif.italic.chinese-gb18030=AR PL ZenKai Uni ++serif.italic.assamese=Lohit Assamese ++serif.italic.devanagari=Lohit Devanagari + serif.italic.bengali=Lohit Bengali + serif.italic.gujarati=Lohit Gujarati + serif.italic.hindi=Lohit Hindi +@@ -200,6 +222,8 @@ + serif.bolditalic.korean=Baekmuk Batang + serif.bolditalic.chinese-big5=AR PL ZenKai Uni + serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni ++serif.bolditalic.assamese=Lohit Assamese ++serif.bolditalic.devanagari=Lohit Devanagari + serif.bolditalic.bengali=Lohit Bengali + serif.bolditalic.gujarati=Lohit Gujarati + serif.bolditalic.hindi=Lohit Hindi +@@ -215,6 +239,8 @@ + monospaced.plain.korean=Baekmuk Gulim + monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni + monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.plain.assamese=Lohit Assamese ++monospaced.plain.devanagari=Lohit Devanagari + monospaced.plain.bengali=Lohit Bengali + monospaced.plain.gujarati=Lohit Gujarati + monospaced.plain.hindi=Lohit Hindi +@@ -230,6 +256,8 @@ + monospaced.bold.korean=Baekmuk Gulim + monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bold.assamese=Lohit Assamese ++monospaced.bold.devanagari=Lohit Devanagari + monospaced.bold.bengali=Lohit Bengali + monospaced.bold.gujarati=Lohit Gujarati + monospaced.bold.hindi=Lohit Hindi +@@ -245,6 +273,8 @@ + monospaced.italic.korean=Baekmuk Gulim + monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.italic.assamese=Lohit Assamese ++monospaced.italic.devanagari=Lohit Devanagari + monospaced.italic.bengali=Lohit Bengali + monospaced.italic.gujarati=Lohit Gujarati + monospaced.italic.hindi=Lohit Hindi +@@ -260,6 +290,8 @@ + monospaced.bolditalic.korean=Baekmuk Gulim + monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bolditalic.assamese=Lohit Assamese ++monospaced.bolditalic.devanagari=Lohit Devanagari + monospaced.bolditalic.bengali=Lohit Bengali + monospaced.bolditalic.gujarati=Lohit Gujarati + monospaced.bolditalic.hindi=Lohit Hindi +@@ -275,6 +307,8 @@ + dialoginput.plain.korean=Baekmuk Gulim + dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.plain.assamese=Lohit Assamese ++dialoginput.plain.devanagari=Lohit Devanagari + dialoginput.plain.bengali=Lohit Bengali + dialoginput.plain.gujarati=Lohit Gujarati + dialoginput.plain.hindi=Lohit Hindi +@@ -290,6 +324,8 @@ + dialoginput.bold.korean=Baekmuk Gulim + dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bold.assamese=Lohit Assamese ++dialoginput.bold.devanagari=Lohit Devanagari + dialoginput.bold.bengali=Lohit Bengali + dialoginput.bold.gujarati=Lohit Gujarati + dialoginput.bold.hindi=Lohit Hindi +@@ -305,6 +341,8 @@ + dialoginput.italic.korean=Baekmuk Gulim + dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.italic.assamese=Lohit Assamese ++dialoginput.italic.devanagari=Lohit Devanagari + dialoginput.italic.bengali=Lohit Bengali + dialoginput.italic.gujarati=Lohit Gujarati + dialoginput.italic.hindi=Lohit Hindi +@@ -320,6 +358,8 @@ + dialoginput.bolditalic.korean=Baekmuk Gulim + dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bolditalic.assamese=Lohit Assamese ++dialoginput.bolditalic.devanagari=Lohit Devanagari + dialoginput.bolditalic.bengali=Lohit Bengali + dialoginput.bolditalic.gujarati=Lohit Gujarati + dialoginput.bolditalic.hindi=Lohit Hindi +@@ -356,21 +396,24 @@ + filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf + filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf + +-filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf + filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc + filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc +-filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf/gulim.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf/batang.ttf ++ ++filename.Lohit_Assamese=/usr/share/fonts/lohit-assamese/Lohit-Assamese.ttf ++filename.Lohit_Devanagari=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf ++filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/Lohit-Bengali.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf ++filename.Lohit_Hindi=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf ++filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf ++filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/Lohit-Malayalam.ttf ++filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/Lohit-Oriya.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/Lohit-Punjabi.ttf ++filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf ++filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/Lohit-Telugu.ttf + +-filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf +-filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf + filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf + +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2010-11-04 11:06:26.695428114 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2010-11-04 11:06:25.602455633 +0100 +@@ -35,6 +35,8 @@ + dialog.plain.korean=Baekmuk Gulim + dialog.plain.chinese-big5=AR PL ShanHeiSun Uni + dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.plain.assamese=Lohit Assamese ++dialog.plain.devanagari=Lohit Devanagari + dialog.plain.bengali=Lohit Bengali + dialog.plain.gujarati=Lohit Gujarati + dialog.plain.hindi=Lohit Hindi +@@ -50,6 +52,8 @@ + dialog.bold.korean=Baekmuk Gulim + dialog.bold.chinese-big5=AR PL ShanHeiSun Uni + dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bold.assamese=Lohit Assamese ++dialog.bold.devanagari=Lohit Devanagari + dialog.bold.bengali=Lohit Bengali + dialog.bold.gujarati=Lohit Gujarati + dialog.bold.hindi=Lohit Hindi +@@ -65,6 +69,8 @@ + dialog.italic.korean=Baekmuk Gulim + dialog.italic.chinese-big5=AR PL ShanHeiSun Uni + dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.italic.assamese=Lohit Assamese ++dialog.italic.devanagari=Lohit Devanagari + dialog.italic.bengali=Lohit Bengali + dialog.italic.gujarati=Lohit Gujarati + dialog.italic.hindi=Lohit Hindi +@@ -80,6 +86,8 @@ + dialog.bolditalic.korean=Baekmuk Gulim + dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bolditalic.assamese=Lohit Assamese ++dialog.bolditalic.devanagari=Lohit Devanagari + dialog.bolditalic.bengali=Lohit Bengali + dialog.bolditalic.gujarati=Lohit Gujarati + dialog.bolditalic.hindi=Lohit Hindi +@@ -95,6 +103,8 @@ + sansserif.plain.korean=Baekmuk Gulim + sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni + sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.plain.assamese=Lohit Assamese ++sansserif.plain.devanagari=Lohit Devanagari + sansserif.plain.bengali=Lohit Bengali + sansserif.plain.gujarati=Lohit Gujarati + sansserif.plain.hindi=Lohit Hindi +@@ -110,6 +120,8 @@ + sansserif.bold.korean=Baekmuk Gulim + sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bold.assamese=Lohit Assamese ++sansserif.bold.devanagari=Lohit Devanagari + sansserif.bold.bengali=Lohit Bengali + sansserif.bold.gujarati=Lohit Gujarati + sansserif.bold.hindi=Lohit Hindi +@@ -125,6 +137,8 @@ + sansserif.italic.korean=Baekmuk Gulim + sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.italic.assamese=Lohit Assamese ++sansserif.italic.devanagari=Lohit Devanagari + sansserif.italic.bengali=Lohit Bengali + sansserif.italic.gujarati=Lohit Gujarati + sansserif.italic.hindi=Lohit Hindi +@@ -140,6 +154,8 @@ + sansserif.bolditalic.korean=Baekmuk Gulim + sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bolditalic.assamese=Lohit Assamese ++sansserif.bolditalic.devanagari=Lohit Devanagari + sansserif.bolditalic.bengali=Lohit Bengali + sansserif.bolditalic.gujarati=Lohit Gujarati + sansserif.bolditalic.hindi=Lohit Hindi +@@ -155,6 +171,8 @@ + serif.plain.korean=Baekmuk Batang + serif.plain.chinese-big5=AR PL ZenKai Uni + serif.plain.chinese-gb18030=AR PL ZenKai Uni ++serif.plain.assamese=Lohit Assamese ++serif.plain.devanagari=Lohit Devanagari + serif.plain.bengali=Lohit Bengali + serif.plain.gujarati=Lohit Gujarati + serif.plain.hindi=Lohit Hindi +@@ -170,6 +188,8 @@ + serif.bold.korean=Baekmuk Batang + serif.bold.chinese-big5=AR PL ZenKai Uni + serif.bold.chinese-gb18030=AR PL ZenKai Uni ++serif.bold.assamese=Lohit Assamese ++serif.bold.devanagari=Lohit Devanagari + serif.bold.bengali=Lohit Bengali + serif.bold.gujarati=Lohit Gujarati + serif.bold.hindi=Lohit Hindi +@@ -185,6 +205,8 @@ + serif.italic.korean=Baekmuk Batang + serif.italic.chinese-big5=AR PL ZenKai Uni + serif.italic.chinese-gb18030=AR PL ZenKai Uni ++serif.italic.assamese=Lohit Assamese ++serif.italic.devanagari=Lohit Devanagari + serif.italic.bengali=Lohit Bengali + serif.italic.gujarati=Lohit Gujarati + serif.italic.hindi=Lohit Hindi +@@ -200,6 +222,8 @@ + serif.bolditalic.korean=Baekmuk Batang + serif.bolditalic.chinese-big5=AR PL ZenKai Uni + serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni ++serif.bolditalic.assamese=Lohit Assamese ++serif.bolditalic.devanagari=Lohit Devanagari + serif.bolditalic.bengali=Lohit Bengali + serif.bolditalic.gujarati=Lohit Gujarati + serif.bolditalic.hindi=Lohit Hindi +@@ -215,6 +239,8 @@ + monospaced.plain.korean=Baekmuk Gulim + monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni + monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.plain.assamese=Lohit Assamese ++monospaced.plain.devanagari=Lohit Devanagari + monospaced.plain.bengali=Lohit Bengali + monospaced.plain.gujarati=Lohit Gujarati + monospaced.plain.hindi=Lohit Hindi +@@ -230,6 +256,8 @@ + monospaced.bold.korean=Baekmuk Gulim + monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bold.assamese=Lohit Assamese ++monospaced.bold.devanagari=Lohit Devanagari + monospaced.bold.bengali=Lohit Bengali + monospaced.bold.gujarati=Lohit Gujarati + monospaced.bold.hindi=Lohit Hindi +@@ -245,6 +273,8 @@ + monospaced.italic.korean=Baekmuk Gulim + monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.italic.assamese=Lohit Assamese ++monospaced.italic.devanagari=Lohit Devanagari + monospaced.italic.bengali=Lohit Bengali + monospaced.italic.gujarati=Lohit Gujarati + monospaced.italic.hindi=Lohit Hindi +@@ -260,6 +290,8 @@ + monospaced.bolditalic.korean=Baekmuk Gulim + monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bolditalic.assamese=Lohit Assamese ++monospaced.bolditalic.devanagari=Lohit Devanagari + monospaced.bolditalic.bengali=Lohit Bengali + monospaced.bolditalic.gujarati=Lohit Gujarati + monospaced.bolditalic.hindi=Lohit Hindi +@@ -275,6 +307,8 @@ + dialoginput.plain.korean=Baekmuk Gulim + dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.plain.assamese=Lohit Assamese ++dialoginput.plain.devanagari=Lohit Devanagari + dialoginput.plain.bengali=Lohit Bengali + dialoginput.plain.gujarati=Lohit Gujarati + dialoginput.plain.hindi=Lohit Hindi +@@ -290,6 +324,8 @@ + dialoginput.bold.korean=Baekmuk Gulim + dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bold.assamese=Lohit Assamese ++dialoginput.bold.devanagari=Lohit Devanagari + dialoginput.bold.bengali=Lohit Bengali + dialoginput.bold.gujarati=Lohit Gujarati + dialoginput.bold.hindi=Lohit Hindi +@@ -305,6 +341,8 @@ + dialoginput.italic.korean=Baekmuk Gulim + dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.italic.assamese=Lohit Assamese ++dialoginput.italic.devanagari=Lohit Devanagari + dialoginput.italic.bengali=Lohit Bengali + dialoginput.italic.gujarati=Lohit Gujarati + dialoginput.italic.hindi=Lohit Hindi +@@ -320,6 +358,8 @@ + dialoginput.bolditalic.korean=Baekmuk Gulim + dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bolditalic.assamese=Lohit Assamese ++dialoginput.bolditalic.devanagari=Lohit Devanagari + dialoginput.bolditalic.bengali=Lohit Bengali + dialoginput.bolditalic.gujarati=Lohit Gujarati + dialoginput.bolditalic.hindi=Lohit Hindi +@@ -356,21 +396,24 @@ + filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf + filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf + +-filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc +-filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.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 ++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf/batang.ttf ++ ++filename.Lohit_Assamese=/usr/share/fonts/lohit-assamese/Lohit-Assamese.ttf ++filename.Lohit_Devanagari=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf ++filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/Lohit-Bengali.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf ++filename.Lohit_Hindi=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf ++filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf ++filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/Lohit-Malayalam.ttf ++filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/Lohit-Oriya.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/Lohit-Punjabi.ttf ++filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf ++filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/Lohit-Telugu.ttf + +-filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf +-filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf + filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf +