Provided by: Lubos Lunak <l.lunak@suse.cz>

However FcConfigUptoDate() doesn't seem to work. See the attached patch.
    First there's an obvious misplaced parenthesis making it return always
    false, and second, even this call fails to detect font changes (e.g.
    adding a new font to /usr/X11R6/lib/X11/fonts/truetype). The patch
    should fix that as well. The problem seems to be triggered by my
    fonts.conf specifying only /usr/X11R6/lib/X11/fonts , and therefore
    config->configDirs doesn't include subdirs, unlike config->fontDirs.

diff --git a/ChangeLog b/ChangeLog
index a888099042a4dad13cc6a44d047d76b6fea6073c..552bc67313a4cbd2dc51f066aac1073cdcbabfd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-06-30  Keith Packard  <keithp@keithp.com>
+
+       Provided by: Lubos Lunak <l.lunak@suse.cz>
+
+       * src/fccfg.c: (FcConfigUptoDate):
+       However FcConfigUptoDate() doesn't seem to work. See the attached
+       patch.  First there's an obvious misplaced parenthesis making it
+       return always false, and second, even this call fails to detect font
+       changes (e.g.  adding a new font to 
+       /usr/X11R6/lib/X11/fonts/truetype). The patch should fix that as
+       well. The problem seems to be triggered by my fonts.conf specifying
+       only /usr/X11R6/lib/X11/fonts , and therefore config->configDirs
+       doesn't include subdirs, unlike config->fontDirs.
+
 2004-06-03  Keith Packard  <keithp@keithp.com>
 
        * fontconfig/fontconfig.h:

diff --git a/src/fccfg.c b/src/fccfg.c
index b02346739d05959ae60af5899abd104ae9e5a8f3..561294974092b03a9a8d5a2ddf3c279d8e68efb4 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -166,9 +166,9 @@ FcConfigUptoDate (FcConfig *config)
            return FcFalse;
     }
     config_time = FcConfigNewestFile (config->configFiles);
-    font_time = FcConfigNewestFile (config->configDirs);
+    font_time = FcConfigNewestFile (config->fontDirs);
     if ((config_time.set && config_time.time - config->rescanTime > 0) ||
-       (font_time.set && font_time.time - config->rescanTime) > 0)
+       (font_time.set && (font_time.time - config->rescanTime) > 0))
     {
        return FcFalse;
     }