- updated

Changed files:
    fontconfig-blacklist.patch -> 1.2
    fontconfig-date.patch -> 1.2
    fontconfig-defaultconfig.patch -> 1.2

diff --git a/fontconfig-blacklist.patch b/fontconfig-blacklist.patch
index 43eb110a7df9db532b1d5579dc535dca9858854c..eb271bf8c65cee7c4fa25c28c4863e24f815d769 100644 (file)
--- a/fontconfig-blacklist.patch
+++ b/fontconfig-blacklist.patch
@@ -1,6 +1,7 @@
---- fontconfig/src/fcdir.c.blacklist   Mon Aug 26 15:57:40 2002
-+++ fontconfig/src/fcdir.c     Fri Aug 30 14:59:05 2002
-@@ -150,6 +150,40 @@
+diff -urN fontconfig-2.2.0.orig/src/fcdir.c fontconfig-2.2.0/src/fcdir.c
+--- fontconfig-2.2.0.orig/src/fcdir.c  Mon May  5 06:45:48 2003
++++ fontconfig-2.2.0/src/fcdir.c       Mon May  5 06:48:11 2003
+@@ -151,6 +151,40 @@
      return ret;
  }
  
@@ -40,8 +41,8 @@
 +
  #define FC_MAX_FILE_LEN           4096
  
- FcBool
-@@ -201,7 +235,8 @@
+ /*
+@@ -215,7 +249,8 @@
      }
      while (ret && (e = readdir (d)))
      {

diff --git a/fontconfig-date.patch b/fontconfig-date.patch
index 25e32098d943d8972694cdf27689766efd2ced6c..5285f51a750b9bc0976f29cc90e64145e0ad1f7a 100644 (file)
--- a/fontconfig-date.patch
+++ b/fontconfig-date.patch
@@ -1,12 +1,12 @@
-diff -urN aaa/fcpackage.2_0/fontconfig/setfontdirs fcpackage.2_0/fontconfig/setfontdirs
---- aaa/fcpackage.2_0/fontconfig/setfontdirs   Thu Aug  1 18:17:33 2002
-+++ fcpackage.2_0/fontconfig/setfontdirs       Tue Oct 15 21:29:07 2002
-@@ -11,7 +11,7 @@
- chmod +w fonts.conf
- ed fonts.conf << EOF
- /FONTPATH_END/a
--<!-- Font directory list configured on `date` -->
-+<!-- Font directory list configured on `(LC_ALL=C date)` -->
- .
- +r $FONTDIRS
- a
+diff -urN fontconfig-2.2.0.orig/fonts.conf.in fontconfig-2.2.0/fonts.conf.in
+--- fontconfig-2.2.0.orig/fonts.conf.in        Mon May  5 06:45:48 2003
++++ fontconfig-2.2.0/fonts.conf.in     Mon May  5 06:49:53 2003
+@@ -21,7 +21,7 @@
+       Keith Packard
+ -->
+ 
+-<!-- Font directory list configured on @FC_FONTDATE@ -->
++<!-- Font directory list -->
+ 
+       <dir>@FC_DEFAULT_FONTS@</dir>
+       @FC_FONTPATH@

diff --git a/fontconfig-defaultconfig.patch b/fontconfig-defaultconfig.patch
index 25a35c5de18c12669eae3ef442fae4295d23b95d..4d1367b102b7dff28b9b0a413503fa7ac300adbd 100644 (file)
--- a/fontconfig-defaultconfig.patch
+++ b/fontconfig-defaultconfig.patch
@@ -1,18 +1,38 @@
---- fontconfig/fonts.conf.in.defaultconfig     Mon Aug 19 15:31:59 2002
-+++ fontconfig/fonts.conf.in   Mon Sep  2 23:32:37 2002
-@@ -170,45 +170,86 @@
-       <alias>
+diff -urN fontconfig-2.2.0.orig/fonts.conf.in fontconfig-2.2.0/fonts.conf.in
+--- fontconfig-2.2.0.orig/fonts.conf.in        Mon May  5 06:45:48 2003
++++ fontconfig-2.2.0/fonts.conf.in     Mon May  5 06:50:47 2003
+@@ -265,41 +265,99 @@
                <family>serif</family>
                <prefer>
+                       <family>Bitstream Vera Serif</family>
 -                      <family>Times New Roman</family>
                        <family>Nimbus Roman No9 L</family>
                        <family>Luxi Serif</family>
 -                      <family>Times</family>
++                      <family>Tomas</family>
++                      <family>Artsounk</family>
++                      <family>BPG UTF8 M</family>
++                      <family>Phaisarn</family>
++                      <family>Phaisarn98</family>
++                      <family>Norasi</family>
++                      <family>Times-Hebrew</family>
++                      <family>Dror</family>
++                      <family>JG LaoTimes</family>
++                      <family>Saysettha Unicode</family>
++                      <family>Pigiarniq</family>
++                      <family>KacstBook</family>
++                      <family>Urdu Naqsh Nastalique</family>
++                      <family>Raghindi</family>
++                      <family>malayalam</family>
++                      <family>MS Mincho</family>
                        <family>Kochi Mincho</family>
-+                      <family>ZYSong18030</family>
++                      <family>ZYSong18030</family>
++                      <family>MS Song</family>
                        <family>AR PL SungtiL GB</family>
                        <family>AR PL Mingti2L Big5</family>
-                       <family>Baekmuk Batang</family>                 
+-                      <family>Baekmuk Batang</family>                 
++                      <family>Baekmuk Batang</family>
++                      <family>TSCu_Times</family>
 +                      <family>Times New Roman</family>
 +                      <family>Times</family>
                </prefer>
@@ -20,82 +40,72 @@
        <alias>
                <family>sans-serif</family>
                <prefer>
+                       <family>Bitstream Vera Sans</family>
 -                      <family>Verdana</family>
 -                      <family>Nimbus Sans L</family>
-                       <family>Luxi Sans</family>
--                      <family>Arial</family>
-+                      <family>Nimbus Sans L</family>
+-                      <family>Luxi Sans</family>
++                      <family>Luxi Sans</family>
++                      <family>Nimbus Sans L</family>
+                       <family>Arial</family>
                        <family>Helvetica</family>
++                      <family>Arija</family>
++                      <family>Verdana</family>
++                      <family>Lucida Sans Unicode</family>
++                      <family>Tahoma</family>
++                      <family>Yudit Unicode</family>
++                      <family>Kerkis</family>
++                      <family>ArmNet Helvetica</family>
++                      <family>Artsounk</family>
++                      <family>BPG UTF8 M</family>
++                      <family>Norasi</family>
++                      <family>Nachlieli</family>
++                      <family>Saysettha Unicode</family>
++                      <family>JG Lao Old Arial</family>
++                      <family>GF Zemen Unicode</family>
++                      <family>Pigiarniq</family>
++                      <family>KacstBook</family>
++                      <family>Urdu Naqsh Nastalique</family>
++                      <family>Raghindi</family>
++                      <family>malayalam</family>
++                      <family>Teams</family>
++                      <family>MS Gothic</family>
                        <family>Kochi Gothic</family>
--                      <family>AR PL KaitiM GB</family>
--                      <family>AR PL KaitiM Big5</family>
--                      <family>Baekmuk Dotum</family>
-+                      <family>ZYSong18030</family>
-+                      <family>AR PL SungtiL GB</family>
-+                      <family>AR PL Mingti2L Big5</family>
-+                      <family>Baekmuk Gulim</family>
-+                      <family>Verdana</family>
-+                      <family>Arial</family>
++                      <family>ZYSong18030</family>
++                      <family>AR PL SungtiL GB</family>
++                      <family>AR PL Mingti2L Big5</family>
++                      <family>Baekmuk Gulim</family>
+                       <family>AR PL KaitiM GB</family>
+                       <family>AR PL KaitiM Big5</family>
+                       <family>Baekmuk Dotum</family>
                        <family>SimSun</family>
++                      <family>TSCu_Paranar</family>
++                      <family>Arial Unicode</family>
++                      <family>Code2000</family>
                </prefer>
        </alias>
        <alias>
                <family>monospace</family>
                <prefer>
+                       <family>Bitstream Vera Sans Mono</family>
 -                      <family>Andale Mono</family>
 -                      <family>Courier New</family>
                        <family>Luxi Mono</family>
                        <family>Nimbus Mono L</family>
++                      <family>Courier</family>
++                      <family>Kurjeris</family>
++                      <family>Courier MonoThai</family>
++                      <family>Courier-Hebrew</family>
++                      <family>Hasida</family>
++                      <family>GF Zemen Unicode</family>
                        <family>Kochi Gothic</family>
--                      <family>AR PL KaitiM GB</family>
--                      <family>Baekmuk Dotum</family>
-+                      <family>ZYSong18030</family>
-+                      <family>AR PL SungtiL GB</family>
-+                      <family>AR PL Mingti2L Big5</family>
-+                      <family>Baekmuk Gulim</family>
-+                      <family>Andale Mono</family>
-+                      <family>Courier New</family>
++                      <family>MS Gothic</family>
++                      <family>ZYSong18030</family>
++                      <family>AR PL SungtiL GB</family>
++                      <family>AR PL Mingti2L Big5</family>
++                      <family>Baekmuk Gulim</family>
++                      <family>Andale Mono</family>
++                      <family>Courier New</family>
++                      <family>TSC_AvarangalFxd</family>
+                       <family>AR PL KaitiM GB</family>
+                       <family>Baekmuk Dotum</family>
                </prefer>
-       </alias>
- 
- <!-- 
-+ We can't hint CJK fonts well, so turn off hinting for CJK fonts.
-+ -->
-+
-+      <match target="font">
-+              <test name="lang" compare="contains">
-+                      <string>ja</string>
-+              </test>
-+              <edit name="hinting" mode="assign">
-+                      <bool>false</bool>
-+              </edit>
-+                <!-- the rh_prefer_bitmaps options (a nonstandard
-+                     Red Hat extension), controls whether embedded 
-+                     bitmaps, when available are preferred
-+                     to antialiased rendering. For Japanese,
-+                     we prefer antialiased rendering -->
-+              <edit name="rh_prefer_bitmaps" mode="assign">
-+                      <bool>false</bool>
-+              </edit>
-+      </match>
-+      <match target="font">
-+              <test name="lang" compare="contains">
-+                      <string>ko</string>
-+              </test>
-+              <edit name="hinting" mode="assign">
-+                      <bool>false</bool>
-+              </edit>
-+      </match>
-+      <match target="font">
-+              <test name="lang" compare="contains">
-+                      <string>zh</string>
-+              </test>
-+              <edit name="hinting" mode="assign">
-+                      <bool>false</bool>
-+              </edit>
-+      </match>
-+
-+<!-- 
-  Artificial oblique for fonts without an italic or oblique version
-  -->
-