diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-04-06 15:36:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-12 14:05:38 +0100 |
commit | 6fcfe3848246bd36021c3329701b83fb994a01fd (patch) | |
tree | 072bc99b66cc21b6ac889c443aca00c802d7ffde /meta/recipes-graphics/fontconfig/fontconfig | |
parent | 8a2435b3e0c22c73752071181c7d9b6a1a29207e (diff) | |
download | poky-6fcfe3848246bd36021c3329701b83fb994a01fd.tar.gz |
fontconfig: update to 2.13.1
Removed patches were upstreammed.
License position in fccache.c was changed since code segment was moved
in the file.
Package requires uuid, therefore dependency on util-linux was added.
inherit gettext was added to fix:
...%s required but not in DEPENDS for file %s. Missing inherit gettext?
(From OE-Core rev: a03936d1bfd01afa320e289e3ba6e7a24979f196)
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/fontconfig/fontconfig')
3 files changed, 6 insertions, 67 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 deleted file mode 100644 index d9bce212f6..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 24 Dec 2018 11:03:58 +0800 | ||
4 | Subject: [PATCH] src/fccache.c: Fix define for HAVE_POSIX_FADVISE | ||
5 | |||
6 | Otherwise, there would be build errors in the following 2 cases: | ||
7 | * define HAVE_POSIX_FADVISE | ||
8 | Or: | ||
9 | * undef HAVE_POSIX_FADVISE | ||
10 | |||
11 | Upstream-Status: Backport [https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16] | ||
12 | |||
13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
14 | --- | ||
15 | fccache.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/fccache.c b/src/fccache.c | ||
19 | index 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 | -- | ||
32 | 2.7.4 | ||
33 | |||
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 deleted file mode 100644 index 3ca9fde967..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 11 Oct 2017 17:40:09 +0300 | ||
4 | Subject: [PATCH] src/fcxml.c: avoid double free() of filename | ||
5 | |||
6 | It's also freed after bail1, so no need to do it here. | ||
7 | |||
8 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221] | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | src/fcxml.c | 1 - | ||
12 | 1 file changed, 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/fcxml.c b/src/fcxml.c | ||
15 | index 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 | -- | ||
27 | 2.14.1 | ||
28 | |||
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch index fca1e65946..30d6423037 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch +++ b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch | |||
@@ -8,13 +8,13 @@ gently refuses and rightly so. | |||
8 | Upstream-Status: Inappropriate [OE-Specific] | 8 | Upstream-Status: Inappropriate [OE-Specific] |
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
10 | 10 | ||
11 | Index: fontconfig-2.11.93/fontconfig.pc.in | 11 | diff --git a/fontconfig.pc.in b/fontconfig.pc.in |
12 | =================================================================== | 12 | index 61b35fb..5bc9bab 100644 |
13 | --- fontconfig-2.11.93.orig/fontconfig.pc.in | 13 | --- a/fontconfig.pc.in |
14 | +++ fontconfig-2.11.93/fontconfig.pc.in | 14 | +++ b/fontconfig.pc.in |
15 | @@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@ | 15 | @@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@ |
16 | Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ | 16 | Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ |
17 | Libs: -L${libdir} -lfontconfig | 17 | Libs: -L${libdir} -lfontconfig |
18 | Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@ | 18 | Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ |
19 | -Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@ | 19 | -Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ |
20 | +Cflags: -I${includedir} | 20 | +Cflags: -I${includedir} |