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-27 11:56:22 +0000 |
| commit | e24659fc039c9f54b841ed01c3d5ff407921398b (patch) | |
| tree | 904568f42ab835d078a808cb7c347d37d9d139aa /meta/recipes-graphics/fontconfig/fontconfig | |
| parent | 22f1eb5165592b47baa35e28c5cb3d4faff36bae (diff) | |
| download | openembedded-core-contrib-e24659fc039c9f54b841ed01c3d5ff407921398b.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.
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 @@ +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=72044] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From f2ade764cc9f009e1fe25b856b24b7695f66a952 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Tue, 26 Nov 2013 17:18:25 +0000 +Subject: [PATCH] fc-cache: --sysroot option takes an argument + +The getopt_long option definitions say that sysroot doesn't take an argument, +when it in fact does. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + fc-cache/fc-cache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c +index 27c7513..bf3b6b4 100644 +--- a/fc-cache/fc-cache.c ++++ b/fc-cache/fc-cache.c +@@ -67,7 +67,7 @@ + const struct option longopts[] = { + {"force", 0, 0, 'f'}, + {"really-force", 0, 0, 'r'}, +- {"sysroot", 0, 0, 'y'}, ++ {"sysroot", required_argument, 0, 'y'}, + {"system-only", 0, 0, 's'}, + {"version", 0, 0, 'V'}, + {"verbose", 0, 0, 'v'}, +-- +1.8.4.4 + |