changeset in /hg/icedtea6: Merge.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Mon Jun 23 07:33:18 PDT 2008
changeset f8d0f74a34a2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f8d0f74a34a2
description:
Merge.
diffstat:
2 files changed, 47 insertions(+), 63 deletions(-)
ChangeLog | 6 ++
patches/icedtea-fonts.patch | 104 ++++++++++++++++---------------------------
diffs (290 lines):
diff -r eb77784e8b0a -r f8d0f74a34a2 ChangeLog
--- a/ChangeLog Mon Jun 23 15:31:39 2008 +0100
+++ b/ChangeLog Mon Jun 23 15:33:06 2008 +0100
@@ -4,6 +4,12 @@ 2008-06-23 Andrew John Hughes <gnu_and
* HACKING: New file to list patches.
* patches/icedtea-gtkplaf.patch: Changed to use
fix from S6624717 as found in OpenJDK7 b27.
+
+2008-06-23 Lillian Angel <langel at redhat.com>
+ Pablo del Campo <pablogdc at gmail.com>
+
+ Fixes Bug #160
+ * patches/icedtea-fonts.patch: Updated for F9.
2008-06-23 Lillian Angel <langel at redhat.com>
diff -r eb77784e8b0a -r f8d0f74a34a2 patches/icedtea-fonts.patch
--- a/patches/icedtea-fonts.patch Mon Jun 23 15:31:39 2008 +0100
+++ b/patches/icedtea-fonts.patch Mon Jun 23 15:33:06 2008 +0100
@@ -1,6 +1,6 @@
---- 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,134 +25,310 @@
+--- openjdk.old/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-03-26 05:00:01.000000000 -0400
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-06-23 10:26:51.000000000 -0400
+@@ -25,7 +25,7 @@
# Version
@@ -9,10 +9,7 @@
version=1
# Component Font Mappings
-
--dialog.plain.latin-1=DejaVu LGC Sans
-+dialog.plain.latin-1=DejaVu Sans
- dialog.plain.japanese-x0208=Sazanami Gothic
+@@ -35,124 +35,300 @@
dialog.plain.korean=Baekmuk Gulim
dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
@@ -26,8 +23,7 @@
+dialog.plain.telugu=Lohit Telugu
+dialog.plain.sinhala=LKLUG
--dialog.bold.latin-1=DejaVu LGC Sans Bold
-+dialog.bold.latin-1=DejaVu Sans Bold
+ dialog.bold.latin-1=DejaVu LGC Sans Bold
dialog.bold.japanese-x0208=Sazanami Gothic
dialog.bold.korean=Baekmuk Gulim
dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -42,8 +38,7 @@
+dialog.bold.telugu=Lohit Telugu
+dialog.bold.sinhala=LKLUG
--dialog.italic.latin-1=DejaVu LGC Sans Oblique
-+dialog.italic.latin-1=DejaVu Sans Oblique
+ dialog.italic.latin-1=DejaVu LGC Sans Oblique
dialog.italic.japanese-x0208=Sazanami Gothic
dialog.italic.korean=Baekmuk Gulim
dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -58,12 +53,12 @@
+dialog.italic.telugu=Lohit Telugu
+dialog.italic.sinhala=LKLUG
--dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
-+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
+ dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
dialog.bolditalic.japanese-x0208=Sazanami Gothic
dialog.bolditalic.korean=Baekmuk Gulim
dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
+dialog.bolditalic.bengali=Lohit Bengali
+dialog.bolditalic.gujarati=Lohit Gujarati
+dialog.bolditalic.hindi=Lohit Hindi
@@ -74,9 +69,7 @@
+dialog.bolditalic.telugu=Lohit Telugu
+dialog.bolditalic.sinhala=LKLUG
--
--sansserif.plain.latin-1=DejaVu LGC Sans
-+sansserif.plain.latin-1=DejaVu Sans
+ sansserif.plain.latin-1=DejaVu LGC Sans
sansserif.plain.japanese-x0208=Sazanami Gothic
sansserif.plain.korean=Baekmuk Gulim
sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -91,8 +84,7 @@
+sansserif.plain.telugu=Lohit Telugu
+sansserif.plain.sinhala=LKLUG
--sansserif.bold.latin-1=DejaVu LGC Sans Bold
-+sansserif.bold.latin-1=DejaVu Sans Bold
+ sansserif.bold.latin-1=DejaVu LGC Sans Bold
sansserif.bold.japanese-x0208=Sazanami Gothic
sansserif.bold.korean=Baekmuk Gulim
sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -107,8 +99,7 @@
+sansserif.bold.telugu=Lohit Telugu
+sansserif.bold.sinhala=LKLUG
--sansserif.italic.latin-1=DejaVu LGC Sans Oblique
-+sansserif.italic.latin-1=DejaVu Sans Oblique
+ sansserif.italic.latin-1=DejaVu LGC Sans Oblique
sansserif.italic.japanese-x0208=Sazanami Gothic
sansserif.italic.korean=Baekmuk Gulim
sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -123,12 +114,12 @@
+sansserif.italic.telugu=Lohit Telugu
+sansserif.italic.sinhala=LKLUG
--sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
-+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
+ sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
sansserif.bolditalic.japanese-x0208=Sazanami Gothic
sansserif.bolditalic.korean=Baekmuk Gulim
sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
+sansserif.bolditalic.bengali=Lohit Bengali
+sansserif.bolditalic.gujarati=Lohit Gujarati
+sansserif.bolditalic.hindi=Lohit Hindi
@@ -139,9 +130,7 @@
+sansserif.bolditalic.telugu=Lohit Telugu
+sansserif.bolditalic.sinhala=LKLUG
--
--serif.plain.latin-1=DejaVu LGC Serif
-+serif.plain.latin-1=DejaVu Serif
+ serif.plain.latin-1=DejaVu LGC Serif
serif.plain.japanese-x0208=Sazanami Mincho
serif.plain.korean=Baekmuk Batang
serif.plain.chinese-big5=AR PL ZenKai Uni
@@ -156,8 +145,7 @@
+serif.plain.telugu=Lohit Telugu
+serif.plain.sinhala=LKLUG
--serif.bold.latin-1=DejaVu LGC Serif Bold
-+serif.bold.latin-1=DejaVu Serif Bold
+ serif.bold.latin-1=DejaVu LGC Serif Bold
serif.bold.japanese-x0208=Sazanami Mincho
serif.bold.korean=Baekmuk Batang
serif.bold.chinese-big5=AR PL ZenKai Uni
@@ -172,8 +160,7 @@
+serif.bold.telugu=Lohit Telugu
+serif.bold.sinhala=LKLUG
--serif.italic.latin-1=DejaVu LGC Serif Oblique
-+serif.italic.latin-1=DejaVu Serif Oblique
+ serif.italic.latin-1=DejaVu LGC Serif Oblique
serif.italic.japanese-x0208=Sazanami Mincho
serif.italic.korean=Baekmuk Batang
serif.italic.chinese-big5=AR PL ZenKai Uni
@@ -188,12 +175,12 @@
+serif.italic.telugu=Lohit Telugu
+serif.italic.sinhala=LKLUG
--serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
-+serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
+ serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
serif.bolditalic.japanese-x0208=Sazanami Mincho
serif.bolditalic.korean=Baekmuk Batang
serif.bolditalic.chinese-big5=AR PL ZenKai Uni
serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+-
+serif.bolditalic.bengali=Lohit Bengali
+serif.bolditalic.gujarati=Lohit Gujarati
+serif.bolditalic.hindi=Lohit Hindi
@@ -204,9 +191,7 @@
+serif.bolditalic.telugu=Lohit Telugu
+serif.bolditalic.sinhala=LKLUG
--
--monospaced.plain.latin-1=DejaVu LGC Sans Mono
-+monospaced.plain.latin-1=DejaVu Sans Mono
+ monospaced.plain.latin-1=DejaVu LGC Sans Mono
monospaced.plain.japanese-x0208=Sazanami Gothic
monospaced.plain.korean=Baekmuk Gulim
monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -221,8 +206,7 @@
+monospaced.plain.telugu=Lohit Telugu
+monospaced.plain.sinhala=LKLUG
--monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
-+monospaced.bold.latin-1=DejaVu Sans Mono Bold
+ monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
monospaced.bold.japanese-x0208=Sazanami Gothic
monospaced.bold.korean=Baekmuk Gulim
monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -237,8 +221,7 @@
+monospaced.bold.telugu=Lohit Telugu
+monospaced.bold.sinhala=LKLUG
--monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
-+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
+ monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
monospaced.italic.japanese-x0208=Sazanami Gothic
monospaced.italic.korean=Baekmuk Gulim
monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -253,12 +236,12 @@
+monospaced.italic.telugu=Lohit Telugu
+monospaced.italic.sinhala=LKLUG
--monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
-+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+ monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
monospaced.bolditalic.japanese-x0208=Sazanami Gothic
monospaced.bolditalic.korean=Baekmuk Gulim
monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
+monospaced.bolditalic.bengali=Lohit Bengali
+monospaced.bolditalic.gujarati=Lohit Gujarati
+monospaced.bolditalic.hindi=Lohit Hindi
@@ -269,9 +252,7 @@
+monospaced.bolditalic.telugu=Lohit Telugu
+monospaced.bolditalic.sinhala=LKLUG
--
--dialoginput.plain.latin-1=DejaVu LGC Sans Mono
-+dialoginput.plain.latin-1=DejaVu Sans Mono
+ dialoginput.plain.latin-1=DejaVu LGC Sans Mono
dialoginput.plain.japanese-x0208=Sazanami Gothic
dialoginput.plain.korean=Baekmuk Gulim
dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -286,8 +267,7 @@
+dialoginput.plain.telugu=Lohit Telugu
+dialoginput.plain.sinhala=LKLUG
--dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold
-+dialoginput.bold.latin-1=DejaVu Sans Mono Bold
+ dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold
dialoginput.bold.japanese-x0208=Sazanami Gothic
dialoginput.bold.korean=Baekmuk Gulim
dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -302,8 +282,7 @@
+dialoginput.bold.telugu=Lohit Telugu
+dialoginput.bold.sinhala=LKLUG
--dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique
-+dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
+ dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique
dialoginput.italic.japanese-x0208=Sazanami Gothic
dialoginput.italic.korean=Baekmuk Gulim
dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -318,8 +297,7 @@
+dialoginput.italic.telugu=Lohit Telugu
+dialoginput.italic.sinhala=LKLUG
--dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
-+dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+ dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
dialoginput.bolditalic.korean=Baekmuk Gulim
dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
@@ -366,20 +344,20 @@
-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_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.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
More information about the distro-pkg-dev
mailing list