summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/fontconfig
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-01-24 15:03:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-24 17:45:25 +0000
commitaffe4ed77787ee1d80c9a761f365ec03a17d63fb (patch)
tree43d715e3684e2de5772f988f6fed20e85ccc6379 /meta/recipes-graphics/fontconfig
parent62dd6c2effce8e239d431c21e515dfec55e3f04e (diff)
downloadpoky-affe4ed77787ee1d80c9a761f365ec03a17d63fb.tar.gz
fontconfig: Fix define for HAVE_POSIX_FADVISE
Otherwise, there would be build errors in the following 2 cases: * define HAVE_POSIX_FADVISE Or: * undef HAVE_POSIX_FADVISE (From OE-Core rev: 6452ccd1f0a2b114fca70d587cb8ed26b189baf3) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/fontconfig')
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch33
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
new file mode 100644
index 0000000000..07b2d6516f
--- /dev/null
+++ b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
@@ -0,0 +1,33 @@
1From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 24 Dec 2018 11:03:58 +0800
4Subject: [PATCH] src/fccache.c: Fix define for HAVE_POSIX_FADVISE
5
6Otherwise, there would be build errors in the following 2 cases:
7* define HAVE_POSIX_FADVISE
8Or:
9* undef HAVE_POSIX_FADVISE
10
11Upstream-Status: Pending
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 fccache.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/fccache.c b/src/fccache.c
19index 6f3c68a..85cc4b4 100644
20--- a/src/fccache.c
21+++ b/src/fccache.c
22@@ -700,7 +700,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di
23 {
24 #if defined(HAVE_MMAP) || defined(__CYGWIN__)
25 cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
26-#if (HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
27+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
28 posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
29 #endif
30 if (cache == MAP_FAILED)
31--
322.7.4
33
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index 6128d5e2ae..beeae7fb10 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -23,6 +23,7 @@ DEPENDS = "expat freetype zlib gperf-native"
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 file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \
26 file://0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb" 29SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"