rpms/fontconfig/devel fontconfig-2.3.93.cvs20060211-move-user-cache.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24494

Modified Files:
	fontconfig-2.3.93.cvs20060211-move-user-cache.patch 
Log Message:
fix patch


fontconfig-2.3.93.cvs20060211-move-user-cache.patch:
 fontconfig/fontconfig.h |    3 ++-
 src/fccache.c           |   17 ++++++++++++++++-
 src/fccfg.c             |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

Index: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.93.cvs20060211-move-user-cache.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontconfig-2.3.93.cvs20060211-move-user-cache.patch	11 Feb 2006 22:35:48 -0000	1.1
+++ fontconfig-2.3.93.cvs20060211-move-user-cache.patch	11 Feb 2006 22:45:00 -0000	1.2
@@ -1,12 +1,12 @@
---- fontconfig-2.3.93.cvs20060211/src/fccache.c.move-user-cache	2006-02-11 17:30:22.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060211/src/fccache.c	2006-02-11 17:32:25.000000000 -0500
+--- fontconfig-2.3.93.cvs20060211/src/fccache.c.move-user-cache	2006-02-11 15:59:04.000000000 -0500
++++ fontconfig-2.3.93.cvs20060211/src/fccache.c	2006-02-11 17:44:42.000000000 -0500
 @@ -430,7 +430,22 @@
  	return FcFalse;
  
      if (!FcAtomicLock (atomic))
 -	goto bail1;
 +    {
-+        FcChar8 *cache_dir; +
++        FcChar8 *cache_dir; 
 +        cache_dir = FcStrDirname (cache_file);
 +
 +        /* quick last ditch effort to try to make the dir in the
@@ -24,8 +24,8 @@
      fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT | O_BINARY, 
  	       S_IRUSR | S_IWUSR);
      if (fd == -1)
---- fontconfig-2.3.93.cvs20060211/src/fccfg.c.move-user-cache	2006-02-11 17:32:43.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060211/src/fccfg.c	2006-02-11 17:33:43.000000000 -0500
+--- fontconfig-2.3.93.cvs20060211/src/fccfg.c.move-user-cache	2006-02-07 15:06:40.000000000 -0500
++++ fontconfig-2.3.93.cvs20060211/src/fccfg.c	2006-02-11 17:40:36.000000000 -0500
 @@ -79,7 +79,7 @@
  
      config->cache = 0;
@@ -35,8 +35,8 @@
  	    goto bail8;
  
  #ifdef _WIN32
---- fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h.move-user-cache	2006-02-11 17:34:11.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h	2006-02-11 17:34:46.000000000 -0500
+--- fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h.move-user-cache	2006-01-27 09:36:11.000000000 -0500
++++ fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h	2006-02-11 17:40:36.000000000 -0500
 @@ -107,8 +107,9 @@
  #define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
  #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION