summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-10 15:02:27 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-09 12:33:17 +0000
commit0e8f5b62507c679ca1d14d4ca10e4900e77889c4 (patch)
tree42267c6ca93453e2246533f977f3e7c653e9dc14 /meta
parentde57f3bca3acab60f445c43a07397c2b298d79a7 (diff)
downloadpoky-0e8f5b62507c679ca1d14d4ca10e4900e77889c4.tar.gz
fontconfig: update to 2.12.6
Add a patch to avoid crashing under qemu. (From OE-Core rev: da1d9898e953207a7649dfa765dd37eea9baf55d) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch28
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb (renamed from meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb)7
2 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
new file mode 100644
index 0000000000..3ca9fde967
--- /dev/null
+++ b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
@@ -0,0 +1,28 @@
1From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 11 Oct 2017 17:40:09 +0300
4Subject: [PATCH] src/fcxml.c: avoid double free() of filename
5
6It's also freed after bail1, so no need to do it here.
7
8Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 src/fcxml.c | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/src/fcxml.c b/src/fcxml.c
15index 19ce96a..edb6054 100644
16--- a/src/fcxml.c
17+++ b/src/fcxml.c
18@@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config,
19
20 fd = FcOpen ((char *) filename, O_RDONLY);
21 if (fd == -1) {
22- FcStrFree (filename);
23 goto bail1;
24 }
25
26--
272.14.1
28
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index a058b35984..fa5f0eecc2 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -22,9 +22,12 @@ DEPENDS = "expat freetype zlib gperf-native"
22 22
23SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 23SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
24 file://revert-static-pkgconfig.patch \ 24 file://revert-static-pkgconfig.patch \
25 file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \
25 " 26 "
26SRC_URI[md5sum] = "4fb01fc3f41760c41c69e37cc784b658" 27
27SRC_URI[sha256sum] = "fd5a6a663f4c4a00e196523902626654dd0c4a78686cbc6e472f338e50fdf806" 28SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"
29SRC_URI[sha256sum] = "064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334"
30
28 31
29do_configure_prepend() { 32do_configure_prepend() {
30 # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280 33 # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280