diff --git a/.gitignore b/.gitignore index b6cca53..dda0808 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ fontconfig-2.8.0.tar.gz /fontconfig-2.12.5.tar.bz2 /fontconfig-2.12.6.tar.bz2 /fontconfig-2.12.91.tar.bz2 +/fontconfig-2.12.92.tar.bz2 diff --git a/fontconfig-fix-crash.patch b/fontconfig-fix-crash.patch deleted file mode 100644 index 64ce911..0000000 --- a/fontconfig-fix-crash.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7ca28c2fedb34c1db5ee3116d335f15195859db0 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Mon, 18 Dec 2017 21:22:21 -0500 -Subject: [PATCH 1/8] Don't crash - -Not proper fix necessarily. But fixes this crash: -https://bugs.freedesktop.org/show_bug.cgi?id=101889#c81 ---- - src/fcmatch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fcmatch.c b/src/fcmatch.c -index 5d30cc7..95bb204 100644 ---- a/src/fcmatch.c -+++ b/src/fcmatch.c -@@ -653,7 +653,7 @@ FcFontRenderPrepare (FcConfig *config, - if (!l) - goto bail0; - dir = FcStrDirname (FcValueString (&l->value)); -- if (FcHashTableFind (config->alias_table, dir, (void **) &alias)) -+ if (config && FcHashTableFind (config->alias_table, dir, (void **) &alias)) - { - FcChar8 *base = FcStrBasename (FcValueString (&l->value)); - FcChar8 *s = FcStrBuildFilename (alias, base, NULL); --- -2.14.3 - -From aa85a2b3b6b652c079e895865e800e3d9b60a5f5 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Tue, 19 Dec 2017 12:16:48 +0900 -Subject: [PATCH 3/8] Try to get current instance of FcConfig as far as - possible - ---- - src/fcmatch.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/fcmatch.c b/src/fcmatch.c -index 95bb204..f06d98a 100644 ---- a/src/fcmatch.c -+++ b/src/fcmatch.c -@@ -653,6 +653,8 @@ FcFontRenderPrepare (FcConfig *config, - if (!l) - goto bail0; - dir = FcStrDirname (FcValueString (&l->value)); -+ if (!config) -+ config = FcConfigGetCurrent (); - if (config && FcHashTableFind (config->alias_table, dir, (void **) &alias)) - { - FcChar8 *base = FcStrBasename (FcValueString (&l->value)); --- -2.14.3 - diff --git a/fontconfig.spec b/fontconfig.spec index 5a2b48c..271047a 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -2,8 +2,8 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.12.91 -Release: 2%{?dist} +Version: 2.12.92 +Release: 1%{?dist} # src/ftglue.[ch] is in Public Domain # src/fccache.c contains Public Domain code # fc-case/CaseFolding.txt is in the UCD @@ -17,7 +17,6 @@ Source2: fc-cache # https://bugzilla.redhat.com/show_bug.cgi?id=140335 Patch0: %{name}-sleep-less.patch Patch1: %{name}-required-freetype-version.patch -Patch2: %{name}-fix-crash.patch BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -154,6 +153,10 @@ HOME=/root /usr/bin/fc-cache -s %doc fontconfig-devel.txt fontconfig-devel %changelog +* Thu Jan 4 2018 Akira TAGOH - 2.12.92-1 +- New upstream release. +- Fix the mis-ordering of evaluating config. (#1530211) + * Sat Dec 23 2017 Akira TAGOH - 2.12.91-2 - Fix crash (#1528706) diff --git a/sources b/sources index 2413228..aab7bde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fontconfig-2.12.91.tar.bz2) = 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301 +SHA512 (fontconfig-2.12.92.tar.bz2) = 4925cde8c988f25f40786b32937df68a9152a9a1e5645d3894aa5b9d70cffb7fd1a7b3e1480d716b93618ad7414bac752be6a77c71f1065dcee57368064030ab