- merge XFree86-4_2_0 branch to HEAD.

Changed files:
    XFree86-fonts-do_not_run_xftchache.patch -> 1.5

diff --git a/XFree86-fonts-do_not_run_xftchache.patch b/XFree86-fonts-do_not_run_xftchache.patch
index 679a8c4d52d306133502bfc420c6fe1bf26e6d73..b6c2ed599468d5b6f22c42d8b76265230f0ab8ad 100644 (file)
--- a/XFree86-fonts-do_not_run_xftchache.patch
+++ b/XFree86-fonts-do_not_run_xftchache.patch
@@ -1,15 +1,17 @@
 --- XFree86-fonts-4.1.0/xc/fonts/scaled/Type1/Imakefile~       Fri Mar 30 04:15:18 2001
 +++ XFree86-fonts-4.1.0/xc/fonts/scaled/Type1/Imakefile        Sat Aug 18 03:00:18 2001
-@@ -26,12 +26,10 @@
- FONTINSTDIR = $(FONTDIR)/Type1
+@@ -26,14 +26,12 @@
  
  MakeFontsDir(fonts.scale)
+ #if UseFreeType2
 -MakeXftCache($(FONTS))
+ #endif
  
  InstallFonts($(FONTINSTDIR))
  InstallFontScale($(FONTINSTDIR))
  InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
+ #if UseFreeType2
 -InstallXftCache($(FONTINSTDIR))
+ #endif
  
  #ifdef IHaveSubdirs
- MakeSubdirs($(SUBDIRS))