X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fontconfig-blacklist.patch;h=1ae4893d93261be56accda5fea8d47065d64bd88;hb=2cc361d33777e586992a52f5b59380bb910ab6f5;hp=43eb110a7df9db532b1d5579dc535dca9858854c;hpb=f8e2cc6b358d301fcf09fa469d3304593102b898;p=packages%2Ffontconfig.git

diff --git a/fontconfig-blacklist.patch b/fontconfig-blacklist.patch
index 43eb110..1ae4893 100644
--- a/fontconfig-blacklist.patch
+++ b/fontconfig-blacklist.patch
@@ -1,7 +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 @@
-     return ret;
+--- fontconfig-2.2.98/src/fcdir.c.orig	2004-12-06 20:25:19.000000000 +0100
++++ fontconfig-2.2.98/src/fcdir.c	2005-01-22 21:26:06.141980024 +0100
+@@ -166,6 +166,40 @@
+     return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
  }
  
 +static FcBool
@@ -38,10 +38,10 @@
 +    return FcFalse;
 +}
 +
- #define FC_MAX_FILE_LEN	    4096
- 
- FcBool
-@@ -201,7 +235,8 @@
+ /*
+  * Scan 'dir', adding font files to 'set' and
+  * subdirectories to 'dirs'
+@@ -232,7 +266,8 @@
      }
      while (ret && (e = readdir (d)))
      {
@@ -50,4 +50,4 @@
 +	    !FcBlackListed (e->d_name))
  	{
  	    strcpy ((char *) base, (char *) e->d_name);
- 	    ret = FcFileScan (set, dirs, cache, blanks, file, force);
+ 	    ret = FcFileScanConfig (set, dirs, cache, blanks, file, force, config);