diff options
author | Ross Burton <ross.burton@intel.com> | 2013-11-26 19:49:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-29 09:52:55 +0000 |
commit | 4a4b36f9130e0ee5915bcbf617d84b8469d07ffb (patch) | |
tree | 5cc4fdb93f9222e16a21da4e6eef4651b2ecc9b1 /meta/recipes-graphics/fontconfig/fontconfig | |
parent | b732052f0ec2986d47de048381c29c659ba9a777 (diff) | |
download | poky-4a4b36f9130e0ee5915bcbf617d84b8469d07ffb.tar.gz |
fontconfig: upgrade to 2.11.0
Drop sysroot patch as a rewritten form has been accepted upstream.
Update license checksums - Google added to COPYING, and the fccache license has
moved.
(From OE-Core rev: e24659fc039c9f54b841ed01c3d5ff407921398b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/fontconfig/fontconfig')
-rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch b/meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch new file mode 100644 index 0000000000..abfdbc710d --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=72044] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From f2ade764cc9f009e1fe25b856b24b7695f66a952 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 26 Nov 2013 17:18:25 +0000 | ||
7 | Subject: [PATCH] fc-cache: --sysroot option takes an argument | ||
8 | |||
9 | The getopt_long option definitions say that sysroot doesn't take an argument, | ||
10 | when it in fact does. | ||
11 | |||
12 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
13 | --- | ||
14 | fc-cache/fc-cache.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c | ||
18 | index 27c7513..bf3b6b4 100644 | ||
19 | --- a/fc-cache/fc-cache.c | ||
20 | +++ b/fc-cache/fc-cache.c | ||
21 | @@ -67,7 +67,7 @@ | ||
22 | const struct option longopts[] = { | ||
23 | {"force", 0, 0, 'f'}, | ||
24 | {"really-force", 0, 0, 'r'}, | ||
25 | - {"sysroot", 0, 0, 'y'}, | ||
26 | + {"sysroot", required_argument, 0, 'y'}, | ||
27 | {"system-only", 0, 0, 's'}, | ||
28 | {"version", 0, 0, 'V'}, | ||
29 | {"verbose", 0, 0, 'v'}, | ||
30 | -- | ||
31 | 1.8.4.4 | ||
32 | |||