sync with OpenBSD -current
This commit is contained in:
parent
5d45cd7ee8
commit
155eb8555e
5506 changed files with 1786257 additions and 1416034 deletions
6
dist/fontconfig/fc-cache/fc-cache.c
vendored
6
dist/fontconfig/fc-cache/fc-cache.c
vendored
|
@ -223,7 +223,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
|
|||
if (cache)
|
||||
was_valid = FcTrue;
|
||||
}
|
||||
|
||||
|
||||
if (!cache)
|
||||
{
|
||||
(*changed)++;
|
||||
|
@ -266,7 +266,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
|
|||
}
|
||||
for (i = 0; i < FcCacheNumSubdir (cache); i++)
|
||||
FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
|
||||
|
||||
|
||||
FcDirCacheUnload (cache);
|
||||
|
||||
sublist = FcStrListCreate (subdirs);
|
||||
|
@ -454,7 +454,7 @@ main (int argc, char **argv)
|
|||
|
||||
FcConfigDestroy (config);
|
||||
FcFini ();
|
||||
/*
|
||||
/*
|
||||
* Now we need to sleep a second (or two, to be extra sure), to make
|
||||
* sure that timestamps for changes after this run of fc-cache are later
|
||||
* then any timestamps we wrote. We don't use gettimeofday() because
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue