diff options
author | Pavel Vinogradov | 2018-02-15 16:24:20 -0500 |
---|---|---|
committer | Pavel Vinogradov | 2018-02-15 16:25:56 -0500 |
commit | f20b265fa9d6fe2ec9b3d531231ef476453affc4 (patch) | |
tree | 9fb1753d11b87d374e931b3365be15190a545be1 | |
parent | b6c8bc4b187ca920800e7eab347cf71b3e15c8c2 (diff) |
x11-libs/fontconfig: devel version 2.12.93
-rwxr-xr-x | x11-libs/fontconfig/DETAILS | 4 | ||||
-rw-r--r-- | x11-libs/fontconfig/HISTORY | 4 | ||||
-rwxr-xr-x | x11-libs/fontconfig/PRE_BUILD | 6 | ||||
-rw-r--r-- | x11-libs/fontconfig/crash.patch | 27 |
4 files changed, 6 insertions, 35 deletions
diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS index 1f622a2f70..9e949ef412 100755 --- a/x11-libs/fontconfig/DETAILS +++ b/x11-libs/fontconfig/DETAILS @@ -1,7 +1,7 @@ SPELL=fontconfig if [[ "$FONTCONFIG_BRANCH" == "devel" ]]; then - VERSION=2.12.91 - SOURCE_HASH=sha512:755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301 + VERSION=2.12.93 + SOURCE_HASH=sha512:f7e83707a9f2f134b3d33b43c2b8b274a16cee3c9705a5acf2883355e1c575e50422cf2bd2bd60cb481708f8ed72cc57e80ca616af0f19a9db3f35c30f7ea8f5 else VERSION=2.12.6 SOURCE_HASH=sha512:2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06 diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY index 5e1c71e752..41fb82c916 100644 --- a/x11-libs/fontconfig/HISTORY +++ b/x11-libs/fontconfig/HISTORY @@ -1,3 +1,7 @@ +2018-02-15 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: devel version 2.12.93 + * PRE_BUILD, crash.patch: removed, applied by upstream + 2018-02-10 Pavel Vinogradov <public@sourcemage.org> * PRE_BUILD, crash.patch: added to fix crashing devel branch diff --git a/x11-libs/fontconfig/PRE_BUILD b/x11-libs/fontconfig/PRE_BUILD deleted file mode 100755 index c351bcdc20..0000000000 --- a/x11-libs/fontconfig/PRE_BUILD +++ /dev/null @@ -1,6 +0,0 @@ -default_pre_build && -cd "${SOURCE_DIRECTORY}" && - -if [[ "${FONTCONFIG_BRANCH}" == "devel" ]]; then - patch -p1 < "${SPELL_DIRECTORY}/crash.patch" -fi diff --git a/x11-libs/fontconfig/crash.patch b/x11-libs/fontconfig/crash.patch deleted file mode 100644 index 66031cdf01..0000000000 --- a/x11-libs/fontconfig/crash.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7ca28c2fedb34c1db5ee3116d335f15195859db0 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Mon, 18 Dec 2017 21:22:21 -0500 -Subject: 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); --- -cgit v1.1 - |