- really updated to 4.0.2

Changed files:
    XFree86-fonts-ISO8859-2.patch -> 1.2
    XFree86-fonts-extras-fix.patch -> 1.2

diff --git a/XFree86-fonts-ISO8859-2.patch b/XFree86-fonts-ISO8859-2.patch
index 4b3f053ea93ec3311ce2de3e1a40d9c92969d39a..00b66404ddebf25a68c2e29ed2a2e68ac51c2546 100644 (file)
--- a/XFree86-fonts-ISO8859-2.patch
+++ b/XFree86-fonts-ISO8859-2.patch
@@ -1,6 +1,6 @@
-diff -urN XFree86-fonts-4.0.2/ulT1mo-beta-1.0/Makefile XFree86-fonts-4.0.2.new/ulT1mo-beta-1.0/Makefile
---- XFree86-fonts-4.0.2/ulT1mo-beta-1.0/Makefile       Thu Jan  1 01:00:00 1970
-+++ XFree86-fonts-4.0.2.new/ulT1mo-beta-1.0/Makefile   Sat Dec 23 21:20:54 2000
+diff -urN XFree86-fonts-4.0.2.orig/ulT1mo-beta-1.0/Makefile XFree86-fonts-4.0.2/ulT1mo-beta-1.0/Makefile
+--- XFree86-fonts-4.0.2.orig/ulT1mo-beta-1.0/Makefile  Thu Jan  1 01:00:00 1970
++++ XFree86-fonts-4.0.2/ulT1mo-beta-1.0/Makefile       Sun Dec 31 02:36:18 2000
 @@ -0,0 +1,24 @@
 +FONTDIR=/usr/share/fonts
 +
@@ -26,9 +26,9 @@ diff -urN XFree86-fonts-4.0.2/ulT1mo-beta-1.0/Makefile XFree86-fonts-4.0.2.new/u
 +      install pfm/*.pfm $(FONTDIR)/Type1/pfm
 +
 +
-diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/100dpi/Imakefile XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/100dpi/Imakefile
---- XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/100dpi/Imakefile   Mon May  3 15:11:59 1999
-+++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/100dpi/Imakefile       Sat Dec 23 21:17:59 2000
+diff -urN XFree86-fonts-4.0.2.orig/xc/fonts/bdf/latin2/100dpi/Imakefile XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/100dpi/Imakefile
+--- XFree86-fonts-4.0.2.orig/xc/fonts/bdf/latin2/100dpi/Imakefile      Mon May  3 15:11:59 1999
++++ XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/100dpi/Imakefile   Sun Dec 31 02:36:18 2000
 @@ -4,6 +4,9 @@
        FontObj(courB18) FontObj(courB24) FontObj(courBO08) \
        FontObj(courBO10) FontObj(courBO12) FontObj(courBO14) \
@@ -107,9 +107,9 @@ diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/100dpi/Imakefile XFree86-fonts
  
  InstallFontObjs($(OBJS1),$(FONTINSTDIR))
  InstallFontObjs($(OBJS2),$(FONTINSTDIR))
-diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/75dpi/Imakefile XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/75dpi/Imakefile
---- XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/75dpi/Imakefile    Mon May  3 15:12:00 1999
-+++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/latin2/75dpi/Imakefile        Sat Dec 23 21:17:59 2000
+diff -urN XFree86-fonts-4.0.2.orig/xc/fonts/bdf/latin2/75dpi/Imakefile XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/75dpi/Imakefile
+--- XFree86-fonts-4.0.2.orig/xc/fonts/bdf/latin2/75dpi/Imakefile       Mon May  3 15:12:00 1999
++++ XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/75dpi/Imakefile    Sun Dec 31 02:36:18 2000
 @@ -4,6 +4,9 @@
        FontObj(courB18) FontObj(courB24) FontObj(courBO08) \
        FontObj(courBO10) FontObj(courBO12) FontObj(courBO14) \
@@ -210,112 +210,51 @@ diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/latin2/75dpi/Imakefile XFree86-fonts-
  
  InstallFontObjs($(OBJS1),$(FONTINSTDIR))
  InstallFontObjs($(OBJS2),$(FONTINSTDIR))
-diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/Imakefile
---- XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile    Sat Dec 23 21:22:21 2000
-+++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/Imakefile        Sat Dec 23 21:15:10 2000
-@@ -8,10 +8,10 @@
-       FontObj(cu-pua12) FontObj(cu12)
- CLEARLYUDIR = $(TOP)/extras/fonts/ClearlyU
+diff -urN XFree86-fonts-4.0.2.orig/xc/fonts/bdf/misc/Imakefile XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile
+--- XFree86-fonts-4.0.2.orig/xc/fonts/bdf/misc/Imakefile       Sun Dec 31 02:33:52 2000
++++ XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile    Sun Dec 31 02:38:34 2000
+@@ -212,8 +212,8 @@
+       FontObj(10x20-ISO8859-1)
+ #endif
  
--OBJS = FontObj(5x7) FontObj(5x7-ISO8859-1) \
-+OBJS = FontObj(5x7) FontObj(5x7-ISO8859-1) FontObj(5x7-ISO8859-2) \
-       FontObj(5x8) FontObj(5x8-ISO8859-1) \
-       FontObj(6x9) FontObj(6x9-ISO8859-1) \
--      FontObj(6x10) FontObj(6x10-ISO8859-1) \
-+      FontObj(6x10) FontObj(6x10-ISO8859-1) FontObj(6x10-ISO8859-2) \
-       FontObj(6x12) FontObj(6x12-ISO8859-1) \
-       FontObj(6x13) FontObj(6x13-ISO8859-1) FontObj(6x13-ISO8859-2) \
-       FontObj(6x13-ISO8859-3) FontObj(6x13-ISO8859-4) \
-@@ -43,6 +43,7 @@
-       FontObj(7x13O-ISO8859-13) FontObj(7x13O-ISO8859-15) \
-       FontObj(7x14) \
-       FontObj(7x14-ISO8859-1) FontObj(7x14-JISX0201.1976-0) \
-+      FontObj(7x14-ISO8859-2) FontObj(7x14B-ISO8859-2) \
-       FontObj(7x14B) FontObj(7x14B-ISO8859-1) \
-       FontObj(8x13) FontObj(8x13-ISO8859-1) FontObj(8x13-ISO8859-2) \
-       FontObj(8x13-ISO8859-3) FontObj(8x13-ISO8859-4) \
-@@ -58,14 +59,14 @@
-       FontObj(8x13O-ISO8859-5) FontObj(8x13O-ISO8859-7) \
-       FontObj(8x13O-ISO8859-9) FontObj(8x13O-ISO8859-13) \
-       FontObj(8x13O-ISO8859-15) \
--      FontObj(8x16) FontObj(8x16rk) \
--      FontObj(9x15) FontObj(9x15-ISO8859-1) \
--      FontObj(9x15B) FontObj(9x15B-ISO8859-1) \
-+      FontObj(8x16) FontObj(8x16-ISO8859-2) FontObj(8x16rk) \
-+      FontObj(9x15) FontObj(9x15-ISO8859-1) FontObj(9x15-ISO8859-2) \
-+      FontObj(9x15B) FontObj(9x15B-ISO8859-1) FontObj(9x15B-ISO8859-2) \
-       FontObj(9x18) FontObj(9x18-ISO8859-1) \
-       FontObj(9x18B) FontObj(9x18B-ISO8859-1) \
--      FontObj(10x20) FontObj(10x20-ISO8859-1) \
-+      FontObj(10x20) FontObj(10x20-ISO8859-1) FontObj(10x20-ISO8859-2) \
-       FontObj(12x13ja) \
+-MISCOBJS = FontObj(8x16) FontObj(8x16rk) \
 -      FontObj(12x24) FontObj(12x24rk) \
++MISCOBJS = FontObj(8x16) FontObj(8x16-ISO8859-2) FontObj(8x16rk) \
 +      FontObj(12x24) FontObj(12x24-ISO8859-2) FontObj(12x24rk) \
-       FontObj(18x18ja) FontObj(18x18ko) \
        FontObj(cursor) FontObj(deccurs) FontObj(decsess) FontObj(olcursor) \
        FontObj(olgl10) FontObj(olgl12) FontObj(olgl14) FontObj(olgl19) \
-@@ -88,12 +89,14 @@
+       FontObj(micro) \
+@@ -576,8 +576,10 @@
  
- FontTarget(5x7)
- FontTarget(5x7-ISO8859-1)
-+FontTarget(5x7-ISO8859-2)
- FontTarget(5x8)
- FontTarget(5x8-ISO8859-1)
- FontTarget(6x9)
- FontTarget(6x9-ISO8859-1)
- FontTarget(6x10)
- FontTarget(6x10-ISO8859-1)
-+FontTarget(6x10-ISO8859-2)
- FontTarget(6x12)
- FontTarget(6x12-ISO8859-1)
- FontTarget(6x13)
-@@ -156,9 +159,11 @@
- FontTarget(7x13O-ISO8859-15)
- FontTarget(7x14)
- FontTarget(7x14-ISO8859-1)
-+FontTarget(7x14-ISO8859-2)
- FontTarget(7x14-JISX0201.1976-0)
- FontTarget(7x14B)
- FontTarget(7x14B-ISO8859-1)
-+FontTarget(7x14B-ISO8859-2)
- FontTarget(8x13)
- FontTarget(8x13-ISO8859-1)
- FontTarget(8x13-ISO8859-2)
-@@ -189,18 +194,23 @@
- FontTarget(8x13O-ISO8859-13)
- FontTarget(8x13O-ISO8859-15)
+ /* Other fonts */
  FontTarget(8x16)
 +FontTarget(8x16-ISO8859-2)
  FontTarget(8x16rk)
- FontTarget(9x15)
- FontTarget(9x15-ISO8859-1)
-+FontTarget(9x15-ISO8859-2)
- FontTarget(9x15B)
- FontTarget(9x15B-ISO8859-1)
-+FontTarget(9x15B-ISO8859-2)
- FontTarget(9x18)
- FontTarget(9x18-ISO8859-1)
- FontTarget(9x18B)
- FontTarget(9x18B-ISO8859-1)
- FontTarget(10x20)
- FontTarget(10x20-ISO8859-1)
-+FontTarget(10x20-ISO8859-2)
  FontTarget(12x24)
 +FontTarget(12x24-ISO8859-2)
  FontTarget(12x24rk)
- FontTarget(12x13ja)
- FontTarget(18x18ja)
-diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/misc/fonts.alias XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/fonts.alias
---- XFree86-fonts-4.0.2/xc/fonts/bdf/misc/fonts.alias  Sun Dec 26 18:47:37 1999
-+++ XFree86-fonts-4.0.2.new/xc/fonts/bdf/misc/fonts.alias      Sat Dec 23 21:19:40 2000
-@@ -23,6 +23,24 @@
+ FontTarget(cursor)
+ FontTarget(deccurs)
+diff -urN XFree86-fonts-4.0.2.orig/xc/fonts/bdf/misc/fonts.alias XFree86-fonts-4.0.2/xc/fonts/bdf/misc/fonts.alias
+--- XFree86-fonts-4.0.2.orig/xc/fonts/bdf/misc/fonts.alias     Sun Dec 26 18:47:37 1999
++++ XFree86-fonts-4.0.2/xc/fonts/bdf/misc/fonts.alias  Sun Dec 31 02:46:14 2000
+@@ -19,10 +19,35 @@
+ 8x16         -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
+ 9x15         -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
+ 9x15bold     -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
++9x18         -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1
++9x18bold     -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1
+ 10x20        -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
  12x24        -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
  nil2         -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
  
 +fixedlatin2    -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
 +variablelatin2 -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-2
 +5x7latin2      -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
++5x8latin2      -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2
++6x9latin2      -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2
 +6x10latin2     -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2
++6x12latin2     -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2
 +6x13latin2     -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
 +6x13boldlatin2 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2
 +7x13latin2     -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2
@@ -327,19 +266,24 @@ diff -urN XFree86-fonts-4.0.2/xc/fonts/bdf/misc/fonts.alias XFree86-fonts-4.0.2.
 +8x16latin2     -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2
 +9x15latin2     -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2
 +9x15boldlatin2 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2
++9x18latin2     -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2
++9x18boldlatin2 -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2
 +10x20latin2    -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2
 +12x24latin2    -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2
 +
  heb6x13      -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
  heb8x13      -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
  
-@@ -75,6 +93,25 @@
+@@ -75,6 +100,28 @@
  -sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
  -jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
  -jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
 +
 +-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-2 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
++-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-2 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2
++-misc-fixed-medium-r-normal--9-80-100-100-c-60-iso8859-2 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2
 +-misc-fixed-medium-r-normal--10-70-100-100-c-60-iso8859-2 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2
++-misc-fixed-medium-r-semicondensed--12-90-100-100-c-60-iso8859-2 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2
 +-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-2 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
 +-misc-fixed-bold-r-semicondensed--13-100-100-100-c-60-iso8859-2 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2
 +-misc-fixed-medium-r-normal--13-100-100-100-c-70-iso8859-2 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2

diff --git a/XFree86-fonts-extras-fix.patch b/XFree86-fonts-extras-fix.patch
index a7833183c9aa2b805c8272456d71ee5a0d1ffbc0..69846218afe8c6f50758d1d389245c6239cc3016 100644 (file)
--- a/XFree86-fonts-extras-fix.patch
+++ b/XFree86-fonts-extras-fix.patch
@@ -1,17 +1,17 @@
---- xc/fonts/bdf/misc/Imakefile.org    Wed Dec 29 01:56:40 1999
-+++ xc/fonts/bdf/misc/Imakefile        Tue Apr 11 15:08:47 2000
-@@ -47,8 +47,8 @@
-       FontObj(clR8x14) FontObj(clR8x16) FontObj(clR8x8) FontObj(clR9x15) \
-       FontObj(k14) FontObj(jiskan16) FontObj(jiskan24) FontObj(hanglg16) \
-       FontObj(hanglm16) FontObj(hanglm24) FontObj(gb16fs) FontObj(gb16st) \
--      FontObj(gb24st) \
--      $(ARABIC24OBJS) $(CLEARLYUOBJS)
-+      FontObj(gb24st) FontObj(arabic24) FontObj(cu-alt12) FontObj(cu-arabic12) \
+diff -ur XFree86-fonts-4.0.2.orig/xc/fonts/bdf/misc/Imakefile XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile
+--- XFree86-fonts-4.0.2.orig/xc/fonts/bdf/misc/Imakefile       Wed Dec 13 00:57:28 2000
++++ XFree86-fonts-4.0.2/xc/fonts/bdf/misc/Imakefile    Sat Dec 30 03:39:42 2000
+@@ -230,7 +230,8 @@
+       FontObj(gb24st)
+ 
+ OBJS = $(UCSOBJS) $(DERIVEDOBJS) $(DERIVEDOBJS2) $(PREDERIVEDOBJS) \
+-      $(MISCOBJS) $(ARABIC24OBJS) $(CLEARLYUOBJS)
++      $(MISCOBJS) FontObj(arabic24) FontObj(cu-alt12) FontObj(cu-arabic12) \
 +      FontObj(cu-lig12) FontObj(cu-pua12) FontObj(cu12)
  
  FONTINSTDIR = $(FONTDIR)/misc
  
-@@ -168,14 +168,6 @@
+@@ -636,14 +637,6 @@
  FontTarget(cu-lig12)
  FontTarget(cu-pua12)
  FontTarget(cu12)
@@ -24,5 +24,5 @@
 -LinkSourceFile(cu-pua12.bdf,$(CLEARLYUDIR))
 -LinkSourceFile(cu12.bdf,$(CLEARLYUDIR))
  
- InstallFonts($(FONTINSTDIR))
- InstallFontAliases($(FONTINSTDIR))
+ #if TruncateUCSFonts
+ MakeTruncatedUCSBdfFont(5x7,MaxUCSChar,5x7t)