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 <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Laurentiu Palcu
2014-04-28 16:44:27 +03:00
committed by Richard Purdie
parent e5423dbf6f
commit c4207f0b5f
2 changed files with 4 additions and 36 deletions

View File

@@ -1,32 +0,0 @@
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

View File

@@ -14,16 +14,16 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
LICENSE = "MIT-style & MIT & PD"
LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
file://src/fccache.c;beginline=1131;endline=1146;md5=754c7b855210ee746e5f0b840fad9a9f"
file://src/fccache.c;beginline=1143;endline=1158;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
SECTION = "libs"
DEPENDS = "expat freetype zlib"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://sysroot-arg.patch"
SRC_URI[md5sum] = "84278204cd7f36adbea7ad8094e039ac"
SRC_URI[sha256sum] = "274c047487b90dacbaa55f4d70b8cdcd556944e7251ce9cf1de442c00a16343b"
"
SRC_URI[md5sum] = "e75e303b4f7756c2b16203a57ac87eba"
SRC_URI[sha256sum] = "b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d"
PACKAGES =+ "fontconfig-utils"
FILES_${PN} =+ "${datadir}/xml/*"