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 07945483a60cd53119656846b1fecd4fc5b7bd09..fbc254052c3c36c67d1fba0227142a2d75f8971a 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-04-07  Keith Packard  <keithp@keithp.com>
 
        * configure.in:

diff --git a/src/fccfg.c b/src/fccfg.c
index d0cf358fe0c03b23cb7f253a904b3831d679fdaa..63163c26c7f4ca9d61851ec0d9987c9eb953c651 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -147,9 +147,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;
     }