Mercurial > hg > release > icedtea6-1.2
changeset 831:c75ccb890160
2008-04-21 Lillian Angel <langel@redhat.com>
Parag Nemade <pnemade@redhat.com>
Fixes #443360
* patches/icedtea-fonts.patch: New patch to fix font paths.
* Makefile.am: Added new patch to the list.
* Makefile.in: Regenerated.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Mon, 21 Apr 2008 14:26:22 -0400 |
| parents | d72c26939d8a |
| children | 87ee93ad7e38 |
| files | ChangeLog Makefile.am Makefile.in patches/icedtea-fonts.patch |
| diffstat | 4 files changed, 68 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Apr 21 14:06:06 2008 -0400 +++ b/ChangeLog Mon Apr 21 14:26:22 2008 -0400 @@ -1,3 +1,11 @@ +2008-04-21 Lillian Angel <langel@redhat.com> + Parag Nemade <pnemade@redhat.com> + + Fixes #443360 + * patches/icedtea-fonts.patch: New patch to fix font paths. + * Makefile.am: Added new patch to the list. + * Makefile.in: Regenerated. + 2008-04-21 Lillian Angel <langel@redhat.com> * patches/icedtea-lib64.patch: Fixed order of library paths on 64-bit.
--- a/Makefile.am Mon Apr 21 14:06:06 2008 -0400 +++ b/Makefile.am Mon Apr 21 14:26:22 2008 -0400 @@ -303,6 +303,7 @@ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ + patches/icedtea-fonts.patch \ $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES)
--- a/Makefile.in Mon Apr 21 14:06:06 2008 -0400 +++ b/Makefile.in Mon Apr 21 14:26:22 2008 -0400 @@ -409,7 +409,8 @@ patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ - patches/icedtea-color-createcontext.patch $(GCC_PATCH) \ + patches/icedtea-color-createcontext.patch \ + patches/icedtea-fonts.patch $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) $(am__append_7) # Patch OpenJDK for plug replacements and ecj.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-fonts.patch Mon Apr 21 14:26:22 2008 -0400 @@ -0,0 +1,57 @@ +--- openjdkold/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-03-26 14:30:01.000000000 +0530 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-04-21 11:21:49.000000000 +0530 +@@ -25,7 +25,7 @@ + + # Version + +-# Uses Fedora Core 6 fonts and file paths. ++# Uses Fedora 9 fonts and file paths. + version=1 + + # Component Font Mappings +@@ -165,24 +165,24 @@ + + # Font File Names + +-filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf +-filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf +-filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf +-filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf +- +-filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf +-filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf +-filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf +-filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf +- +-filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf +-filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf +-filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf +-filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf +- +-filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf ++filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu/DejaVuLGCSans.ttf ++filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf ++filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-Oblique.ttf ++filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-BoldOblique.ttf ++ ++filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu/DejaVuLGCSansMono.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Bold.ttf ++filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Oblique.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-BoldOblique.ttf ++ ++filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu/DejaVuLGCSerif.ttf ++filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu/DejaVuLGCSerif-Bold.ttf ++filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-Oblique.ttf ++filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-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.ttf ++filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf