From 3b8a03c09d3a45f578680b5fe80255af9761b3fa Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@neko.keithp.com>
Date: Sat, 2 Sep 2006 14:54:14 -0700
Subject: [PATCH] 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.
---
 src/fccache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;