Workaround that the cache isn't updated properly. (#921706)
This commit is contained in:
Akira TAGOH
parent
f6b9d2097d
commit
aa77914e9a
158
fontconfig-fix-broken-cache.patch
Normal file
158
fontconfig-fix-broken-cache.patch
Normal file
@ -0,0 +1,158 @@
|
|||||||
|
From f44bfad235e63bb792c38e16ae1fbd281ec1453b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Akira TAGOH <akira@tagoh.org>
|
||||||
|
Date: Thu, 5 Jun 2014 19:06:02 +0900
|
||||||
|
Subject: [PATCH] Workaround another race condition issue
|
||||||
|
|
||||||
|
See https://bugzilla.redhat.com/show_bug.cgi?id=921706
|
||||||
|
---
|
||||||
|
src/fccache.c | 24 +++++++++++++++++++++++-
|
||||||
|
src/fcdir.c | 30 ++++++++++++++++++++++++------
|
||||||
|
src/fcint.h | 7 ++++++-
|
||||||
|
3 files changed, 53 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/fccache.c b/src/fccache.c
|
||||||
|
index 5173e0b..085bd72 100644
|
||||||
|
--- a/src/fccache.c
|
||||||
|
+++ b/src/fccache.c
|
||||||
|
@@ -545,6 +545,26 @@ FcCacheTimeValid (FcCache *cache, struct stat *dir_stat)
|
||||||
|
return cache->checksum == (int) dir_stat->st_mtime;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static FcBool
|
||||||
|
+FcCacheDirsValid (FcCache *cache)
|
||||||
|
+{
|
||||||
|
+ FcStrSet *dirs = FcStrSetCreate ();
|
||||||
|
+ FcBool ret = FcFalse;
|
||||||
|
+
|
||||||
|
+ if (!dirs)
|
||||||
|
+ goto bail;
|
||||||
|
+ if (!FcDirScanOnly (dirs, FcCacheDir (cache)))
|
||||||
|
+ goto bail1;
|
||||||
|
+ ret = cache->dirs_count == dirs->num;
|
||||||
|
+ if (FcDebug () & FC_DBG_CACHE)
|
||||||
|
+ printf ("%s: cache: %d, fs: %d\n", FcCacheDir (cache), cache->dirs_count, dirs->num);
|
||||||
|
+
|
||||||
|
+bail1:
|
||||||
|
+ FcStrSetDestroy (dirs);
|
||||||
|
+bail:
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Map a cache file into memory
|
||||||
|
*/
|
||||||
|
@@ -559,7 +579,8 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat)
|
||||||
|
cache = FcCacheFindByStat (fd_stat);
|
||||||
|
if (cache)
|
||||||
|
{
|
||||||
|
- if (FcCacheTimeValid (cache, dir_stat))
|
||||||
|
+ if (FcCacheTimeValid (cache, dir_stat) &&
|
||||||
|
+ FcCacheDirsValid (cache))
|
||||||
|
return cache;
|
||||||
|
FcDirCacheUnload (cache);
|
||||||
|
cache = NULL;
|
||||||
|
@@ -611,6 +632,7 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat)
|
||||||
|
cache->version < FC_CACHE_CONTENT_VERSION ||
|
||||||
|
cache->size != (intptr_t) fd_stat->st_size ||
|
||||||
|
!FcCacheTimeValid (cache, dir_stat) ||
|
||||||
|
+ !FcCacheDirsValid (cache) ||
|
||||||
|
!FcCacheInsert (cache, fd_stat))
|
||||||
|
{
|
||||||
|
if (allocated)
|
||||||
|
diff --git a/src/fcdir.c b/src/fcdir.c
|
||||||
|
index 3bcd0b8..49259c1 100644
|
||||||
|
--- a/src/fcdir.c
|
||||||
|
+++ b/src/fcdir.c
|
||||||
|
@@ -164,7 +164,8 @@ FcDirScanConfig (FcFontSet *set,
|
||||||
|
FcBlanks *blanks,
|
||||||
|
const FcChar8 *dir,
|
||||||
|
FcBool force, /* XXX unused */
|
||||||
|
- FcConfig *config)
|
||||||
|
+ FcConfig *config,
|
||||||
|
+ FcBool scanOnly)
|
||||||
|
{
|
||||||
|
DIR *d;
|
||||||
|
struct dirent *e;
|
||||||
|
@@ -180,7 +181,7 @@ FcDirScanConfig (FcFontSet *set,
|
||||||
|
if (!set && !dirs)
|
||||||
|
return FcTrue;
|
||||||
|
|
||||||
|
- if (!blanks)
|
||||||
|
+ if (!blanks && !scanOnly)
|
||||||
|
blanks = FcConfigGetBlanks (config);
|
||||||
|
|
||||||
|
/* freed below */
|
||||||
|
@@ -233,7 +234,17 @@ FcDirScanConfig (FcFontSet *set,
|
||||||
|
* Scan file files to build font patterns
|
||||||
|
*/
|
||||||
|
for (i = 0; i < files->num; i++)
|
||||||
|
- FcFileScanConfig (set, dirs, blanks, files->strs[i], config);
|
||||||
|
+ {
|
||||||
|
+ if (scanOnly)
|
||||||
|
+ {
|
||||||
|
+ if (FcFileIsDir (files->strs[i]))
|
||||||
|
+ FcStrSetAdd (dirs, files->strs[i]);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ FcFileScanConfig (set, dirs, blanks, files->strs[i], config);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
bail2:
|
||||||
|
FcStrSetDestroy (files);
|
||||||
|
@@ -257,7 +268,14 @@ FcDirScan (FcFontSet *set,
|
||||||
|
if (cache || !force)
|
||||||
|
return FcFalse;
|
||||||
|
|
||||||
|
- return FcDirScanConfig (set, dirs, blanks, dir, force, FcConfigGetCurrent ());
|
||||||
|
+ return FcDirScanConfig (set, dirs, blanks, dir, force, FcConfigGetCurrent (), FcFalse);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+FcBool
|
||||||
|
+FcDirScanOnly (FcStrSet *dirs,
|
||||||
|
+ const FcChar8 *dir)
|
||||||
|
+{
|
||||||
|
+ return FcDirScanConfig (NULL, dirs, NULL, dir, FcTrue, NULL, FcTrue);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -288,7 +306,7 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
|
||||||
|
/*
|
||||||
|
* Scan the dir
|
||||||
|
*/
|
||||||
|
- if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config))
|
||||||
|
+ if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config, FcFalse))
|
||||||
|
goto bail2;
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -330,7 +348,7 @@ FcDirCacheRescan (const FcChar8 *dir, FcConfig *config)
|
||||||
|
/*
|
||||||
|
* Scan the dir
|
||||||
|
*/
|
||||||
|
- if (!FcDirScanConfig (NULL, dirs, NULL, dir, FcTrue, config))
|
||||||
|
+ if (!FcDirScanConfig (NULL, dirs, NULL, dir, FcTrue, config, FcFalse))
|
||||||
|
goto bail1;
|
||||||
|
/*
|
||||||
|
* Rebuild the cache object
|
||||||
|
diff --git a/src/fcint.h b/src/fcint.h
|
||||||
|
index 3d41b0c..a1b147f 100644
|
||||||
|
--- a/src/fcint.h
|
||||||
|
+++ b/src/fcint.h
|
||||||
|
@@ -849,7 +849,12 @@ FcDirScanConfig (FcFontSet *set,
|
||||||
|
FcBlanks *blanks,
|
||||||
|
const FcChar8 *dir,
|
||||||
|
FcBool force,
|
||||||
|
- FcConfig *config);
|
||||||
|
+ FcConfig *config,
|
||||||
|
+ FcBool scanOnly);
|
||||||
|
+
|
||||||
|
+FcPrivate FcBool
|
||||||
|
+FcDirScanOnly (FcStrSet *dirs,
|
||||||
|
+ const FcChar8 *dir);
|
||||||
|
|
||||||
|
/* fcfont.c */
|
||||||
|
FcPrivate int
|
||||||
|
--
|
||||||
|
1.9.0
|
||||||
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
Summary: Font configuration and customization library
|
Summary: Font configuration and customization library
|
||||||
Name: fontconfig
|
Name: fontconfig
|
||||||
Version: 2.11.1
|
Version: 2.11.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
# src/ftglue.[ch] is in Public Domain
|
# src/ftglue.[ch] is in Public Domain
|
||||||
# src/fccache.c contains Public Domain code
|
# src/fccache.c contains Public Domain code
|
||||||
# fc-case/CaseFolding.txt is in the UCD
|
# fc-case/CaseFolding.txt is in the UCD
|
||||||
@ -18,6 +18,7 @@ Source1: 25-no-bitmap-fedora.conf
|
|||||||
Patch0: %{name}-sleep-less.patch
|
Patch0: %{name}-sleep-less.patch
|
||||||
# https://bugs.freedesktop.org/show_bug.cgi?id=77252
|
# https://bugs.freedesktop.org/show_bug.cgi?id=77252
|
||||||
Patch1: %{name}-fix-fccache-fail.patch
|
Patch1: %{name}-fix-fccache-fail.patch
|
||||||
|
Patch2: %{name}-fix-broken-cache.patch
|
||||||
|
|
||||||
BuildRequires: expat-devel
|
BuildRequires: expat-devel
|
||||||
BuildRequires: freetype-devel >= %{freetype_version}
|
BuildRequires: freetype-devel >= %{freetype_version}
|
||||||
@ -61,6 +62,7 @@ which is useful for developing applications that uses fontconfig.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .sleep-less
|
%patch0 -p1 -b .sleep-less
|
||||||
%patch1 -p1 -b .cache-fail
|
%patch1 -p1 -b .cache-fail
|
||||||
|
%patch2 -p1 -b .broken-cache
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# We don't want to rebuild the docs, but we want to install the included ones.
|
# We don't want to rebuild the docs, but we want to install the included ones.
|
||||||
@ -137,6 +139,9 @@ fi
|
|||||||
%doc fontconfig-devel.txt fontconfig-devel
|
%doc fontconfig-devel.txt fontconfig-devel
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* thu Jun 5 2014 Akira TAGOH <tagoh@redhat.com> - 2.11.1-3
|
||||||
|
- Workaround that the cache isn't updated properly. (#921706)
|
||||||
|
|
||||||
* Fri Apr 11 2014 Akira TAGOH <tagoh@redhat.com> - 2.11.1-2
|
* Fri Apr 11 2014 Akira TAGOH <tagoh@redhat.com> - 2.11.1-2
|
||||||
- Fix failing on updating cache with --really-force.
|
- Fix failing on updating cache with --really-force.
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user