Fix failing on updating cache with --really-force.

This commit is contained in:
Akira TAGOH 2014-04-11 12:43:49 +09:00
parent d6cd6e2824
commit f6b9d2097d
2 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,29 @@
From f44157c809d280e2a0ce87fb078fc4b278d24a67 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 10 Apr 2014 19:27:55 +0900
Subject: [PATCH] Fix fc-cache fail with -r
Do not unlink the cache even if --really-force is given.
because re-scanning process expects the cache exists.
https://bugs.freedesktop.org/show_bug.cgi?id=77252
---
fc-cache/fc-cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 99e0e9f..90ebad3 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -388,7 +388,7 @@ main (int argc, char **argv)
list = FcStrListCreate (updateDirs);
if (list)
{
- ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
+ ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL);
FcStrListDone (list);
}
FcStrSetDestroy (updateDirs);
--
1.9.0

View File

@ -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: 1%{?dist} Release: 2%{?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
@ -15,7 +15,9 @@ URL: http://fontconfig.org
Source1: 25-no-bitmap-fedora.conf Source1: 25-no-bitmap-fedora.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=140335 # https://bugzilla.redhat.com/show_bug.cgi?id=140335
Patch0: fontconfig-sleep-less.patch Patch0: %{name}-sleep-less.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=77252
Patch1: %{name}-fix-fccache-fail.patch
BuildRequires: expat-devel BuildRequires: expat-devel
BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: freetype-devel >= %{freetype_version}
@ -58,6 +60,7 @@ which is useful for developing applications that uses fontconfig.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .sleep-less %patch0 -p1 -b .sleep-less
%patch1 -p1 -b .cache-fail
%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.
@ -134,6 +137,9 @@ fi
%doc fontconfig-devel.txt fontconfig-devel %doc fontconfig-devel.txt fontconfig-devel
%changelog %changelog
* Fri Apr 11 2014 Akira TAGOH <tagoh@redhat.com> - 2.11.1-2
- Fix failing on updating cache with --really-force.
* Mon Mar 24 2014 Akira TAGOH <tagoh@redhat.com> - 2.11.1-1 * Mon Mar 24 2014 Akira TAGOH <tagoh@redhat.com> - 2.11.1-1
- New upstream release. - New upstream release.