From c4207f0b5f5be108ea135c9e46c1d866c4deed2e Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 28 Apr 2014 16:44:27 +0300 Subject: fontconfig: upgrade to 2.11.1 Removed the following patch(es): * sysroot-arg.patch (changes included in release) Correct the fccache.c license checksum and the line numbers because the license snippet has moved and, also, at the previous upgrade the lines were wrong (shifted a couple of lines). (From OE-Core rev: cc337329309a6ad94a68b2813211a15040638c00) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../fontconfig/fontconfig/sysroot-arg.patch | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch (limited to 'meta/recipes-graphics/fontconfig/fontconfig') diff --git a/meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch b/meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch deleted file mode 100644 index abfdbc710d..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=72044] -Signed-off-by: Ross Burton - -From f2ade764cc9f009e1fe25b856b24b7695f66a952 Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf