From: Keith Packard <keithp@neko.keithp.com>
Date: Sat, 2 Sep 2006 21:54:14 +0000 (-0700)
Subject: Allow font caches to contain newer version numbers
X-Git-Tag: 2.3.96~8
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3b8a03c09d3a45f578680b5fe80255af9761b3fa;p=fontconfig.git

Allow font caches to contain newer version numbers

Use the version number inside the cache file to mark backward compatible
changes while continuing to reserve the filename number for incompatible
changes.
---

diff --git a/src/fccache.c b/src/fccache.c
index af2c68f..05dc7ee 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -231,7 +231,7 @@ FcDirCacheMapFd (int fd, off_t size)
 	allocated = FcTrue;
     } 
     if (cache->magic != FC_CACHE_MAGIC_MMAP || 
-	cache->version != FC_CACHE_CONTENT_VERSION ||
+	cache->version < FC_CACHE_CONTENT_VERSION ||
 	cache->size != size)
     {
 	if (allocated)
@@ -323,7 +323,7 @@ FcDirCacheValidateHelper (int fd, off_t size, void *closure)
 	ret = FcFalse;
     else if (c.magic != FC_CACHE_MAGIC_MMAP)
 	ret = FcFalse;
-    else if (c.version != FC_CACHE_CONTENT_VERSION)
+    else if (c.version < FC_CACHE_CONTENT_VERSION)
 	ret = FcFalse;
     else if (fstat (fd, &file_stat) < 0)
 	ret = FcFalse;