SOURCES: XFree86-fonts-TTF_build.patch, XFree86-fonts-do_not_run_f...

qboosh qboosh at pld-linux.org
Mon Apr 30 23:59:03 CEST 2007 

Author: qboosh                       Date: Mon Apr 30 21:59:03 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.6.0

---- Files affected:
SOURCES:
   XFree86-fonts-TTF_build.patch (1.3 -> 1.4) , XFree86-fonts-do_not_run_fccache.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/XFree86-fonts-TTF_build.patch
diff -u SOURCES/XFree86-fonts-TTF_build.patch:1.3 SOURCES/XFree86-fonts-TTF_build.patch:1.4
--- SOURCES/XFree86-fonts-TTF_build.patch:1.3	Mon Sep 27 12:33:37 2004
+++ SOURCES/XFree86-fonts-TTF_build.patch	Mon Apr 30 23:58:58 2007
@@ -1,12 +1,11 @@
-diff -urN aa/xc/fonts/scaled/TTF/Imakefile xc/fonts/scaled/TTF/Imakefile
---- aa/xc/fonts/scaled/TTF/Imakefile	2004-02-16 01:56:16.000000000 +0100
-+++ xc/fonts/scaled/TTF/Imakefile	2004-02-16 23:35:57.222915112 +0100
+--- XFree86-fonts/xc/fonts/scaled/TTF/Imakefile.orig	2007-04-30 22:25:21.131440166 +0200
++++ XFree86-fonts/xc/fonts/scaled/TTF/Imakefile	2007-04-30 22:29:15.112774002 +0200
 @@ -4,7 +4,7 @@
  	luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
  	luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf
  
 -VERASRCDIR = $(TOP)/extras/fonts/Bitstream-Vera
 +VERASRCDIR = ../../../extras/fonts/Bitstream-Vera
- VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
- 	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
+ VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \
+ 	VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
  

================================================================
Index: SOURCES/XFree86-fonts-do_not_run_fccache.patch
diff -u SOURCES/XFree86-fonts-do_not_run_fccache.patch:1.3 SOURCES/XFree86-fonts-do_not_run_fccache.patch:1.4
--- SOURCES/XFree86-fonts-do_not_run_fccache.patch:1.3	Tue Feb 17 01:27:38 2004
+++ SOURCES/XFree86-fonts-do_not_run_fccache.patch	Mon Apr 30 23:58:58 2007
@@ -1,60 +1,85 @@
-diff -urN xc.orig/fonts/scaled/TTF/Imakefile xc/fonts/scaled/TTF/Imakefile
---- xc.orig/fonts/scaled/TTF/Imakefile	Sun Mar  9 13:47:53 2003
-+++ xc/fonts/scaled/TTF/Imakefile	Sun Mar  9 14:47:49 2003
-@@ -11,13 +11,11 @@
+--- xc/fonts/scaled/TTF/Imakefile.orig	2006-03-18 02:34:23.000000000 +0100
++++ xc/fonts/scaled/TTF/Imakefile	2007-04-30 22:20:53.072164339 +0200
+@@ -16,11 +16,8 @@
+ MakeFontsScale($(OBJS))
  MakeFontsDir(fonts.scale)
  
- #if UseFreetype2
 -MakeFcCache($(FONTS))
- #endif
- 
+-
  InstallFonts($(FONTINSTDIR))
  InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
- #if UseFreetype2
 -InstallFcCache($(FONTINSTDIR))
- #endif
  
- #ifdef IHaveSubdirs
-diff -urN xc.orig/fonts/scaled/Type1/Imakefile xc/fonts/scaled/Type1/Imakefile
---- xc.orig/fonts/scaled/Type1/Imakefile	Sun Mar  9 13:47:53 2003
-+++ xc/fonts/scaled/Type1/Imakefile	Sun Mar  9 14:25:27 2003
-@@ -32,13 +32,11 @@
+ LinkSourceFile(Vera.ttf,$(VERASRCDIR))
+ LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
+--- xc/fonts/scaled/Type1/Imakefile.orig	2006-03-18 02:34:23.000000000 +0100
++++ xc/fonts/scaled/Type1/Imakefile	2007-04-30 22:21:20.209710819 +0200
+@@ -73,9 +73,7 @@
+ 
  MakeFontsScale($(OBJS))
  MakeFontsDir(fonts.scale)
- #if UseFreetype2
--MakeFcCache($(FONTS))
- #endif
+-MakeFcCache($(OBJS))
  
  InstallFonts($(FONTINSTDIR))
  InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
- #if UseFreetype2
 -InstallFcCache($(FONTINSTDIR))
- #endif
  
- #ifdef IHaveSubdirs
---- xc/fonts/scaled/Ethiopic/Imakefile.orig	2003-02-04 03:18:19.000000000 +0100
-+++ xc/fonts/scaled/Ethiopic/Imakefile	2003-06-04 00:53:08.000000000 +0200
-@@ -7,7 +7,6 @@
+--- xc/fonts/scaled/Ethiopic/Imakefile.orig	2006-03-18 02:34:23.000000000 +0100
++++ xc/fonts/scaled/Ethiopic/Imakefile	2007-04-30 22:21:39.114788158 +0200
+@@ -6,13 +6,9 @@
+ TTFINSTDIR = $(FONTDIR)/TTF
  OTFINSTDIR = $(FONTDIR)/OTF
  
- #if UseFreetype2
 -MakeFcCache($(TTFFONTS) $(OTFFONTS))
- #endif
- 
+-
  InstallMultipleFlags($(TTFFONTS),$(TTFINSTDIR),$(INSTDATFLAGS))
---- xc/fonts/scaled/Meltho/Imakefile.orig	2003-06-04 01:27:53.000000000 +0200
-+++ xc/fonts/scaled/Meltho/Imakefile	2003-06-04 01:28:04.000000000 +0200
-@@ -15,13 +15,11 @@
+ InstallMultipleFlags($(OTFFONTS),$(OTFINSTDIR),$(INSTDATFLAGS))
+ 
+ InstallFontsDir($(TTFINSTDIR))
+ InstallFontsDir($(OTFINSTDIR))
+ 
+-InstallFcCache($(TTFINSTDIR) $(OTFINSTDIR))
+-
+--- xc/fonts/scaled/Meltho/Imakefile.orig	2006-03-18 02:34:23.000000000 +0100
++++ xc/fonts/scaled/Meltho/Imakefile	2007-04-30 22:22:08.292450898 +0200
+@@ -15,9 +15,6 @@
+ MakeFontsScale($(OBJS))
  MakeFontsDir(fonts.scale)
  
- #if UseFreetype2
 -MakeFcCache($(FONTS))
- #endif
+-
+ InstallFonts($(FONTINSTDIR))
+ InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
+-InstallFcCache($(FONTINSTDIR))
+ 
+--- xc/fonts/bdf/100dpi/Imakefile.orig	2006-03-18 02:34:23.000000000 +0100
++++ xc/fonts/bdf/100dpi/Imakefile	2007-04-30 23:05:46.813671918 +0200
+@@ -63,5 +63,4 @@
+ InstallFontObjs($(OBJS2),$(FONTINSTDIR))
+ InstallFontAliases($(FONTINSTDIR))
+ InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
+-InstallFcCache($(FONTINSTDIR))
+ 
+--- xc/fonts/bdf/75dpi/Imakefile.orig	2006-03-18 02:34:23.000000000 +0100
++++ xc/fonts/bdf/75dpi/Imakefile	2007-04-30 23:05:55.682177306 +0200
+@@ -63,5 +63,4 @@
+ InstallFontObjs($(OBJS2),$(FONTINSTDIR))
+ InstallFontAliases($(FONTINSTDIR))
+ InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
+-InstallFcCache($(FONTINSTDIR))
  
+--- xc/fonts/bdf/cyrillic/Imakefile.orig	2006-03-18 02:34:23.000000000 +0100
++++ xc/fonts/bdf/cyrillic/Imakefile	2007-04-30 23:06:03.782638925 +0200
+@@ -114,4 +114,3 @@
+ InstallFonts($(FONTINSTDIR))
+ InstallFontAliases($(FONTINSTDIR))
+ InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
+-InstallFcCache($(FONTINSTDIR))
+--- xc/fonts/bdf/misc/Imakefile.orig	2007-04-30 22:44:34.389160000 +0200
++++ xc/fonts/bdf/misc/Imakefile	2007-04-30 23:06:13.371185345 +0200
+@@ -1281,5 +1281,4 @@
  InstallFonts($(FONTINSTDIR))
+ InstallFontAliases($(FONTINSTDIR))
  InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
- #if UseFreetype2
 -InstallFcCache($(FONTINSTDIR))
- #endif
  
- #ifdef IHaveSubdirs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/XFree86-fonts-TTF_build.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-fonts-do_not_run_fccache.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list