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.bur...@intel.com
---
...Add-sysroot-option-to-fc-cache-and-fc-cat.patch | 731
.../fontconfig/fontconfig/sysroot-arg.patch| 32 +
.../{fontconfig_2.10.2.bb = fontconfig_2.11.0.bb} | 14 +-
3 files changed, 37 insertions(+), 740 deletions(-)
delete mode 100644
meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch
create mode 100644
meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch
rename meta/recipes-graphics/fontconfig/{fontconfig_2.10.2.bb =
fontconfig_2.11.0.bb} (76%)
diff --git
a/meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch
b/meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch
deleted file mode 100644
index f0b3b7f..000
---
a/meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch
+++ /dev/null
@@ -1,731 +0,0 @@
-Upstream-Status: Pending
-
-From a5eeeafb623a5508d2745f89aaf69118799f7e5c Mon Sep 17 00:00:00 2001
-From: Laurentiu Palcu laurentiu.pa...@intel.com
-Date: Mon, 28 Jan 2013 11:42:56 +0200
-Subject: [PATCH] Add sysroot option to fc-cache and fc-cat
-
-Whether one needs to generate the font cache offline and then deploy the
-image to a target or do some testing in a separate rootfs, the sysroot
-option will facilitate that.
-
-Suppose you've got a rootfs in the following directory:
-/path/to/test/rootfs. In order to contain the fc-cache generation to
-that particular directory, the following command can be used:
-
-fc-cache --sysroot=/path/to/test/rootfs
-
-That will make fc-cache to prepend the sysroot directory to all paths
-during scanning. For example, instead of searching /etc/fonts/ directory
-for configuration files, it will look in /path/to/test/rootfs/etc/fonts.
-The paths found in fonts.conf will also be prepended with the sysroot.
-
-However, the generated cache files will not contain any references to
-sysroot. This way, one can generate the font cache offline and then deploy
-the image to target. Or, simply, use it for various tests without
-polluting the system/user cache files.
-
-In order to inspect the cache generated using the sysroot option, one
-has to use fc-cat like below (for example):
-
-fc-cat --sysroot=/path/to/test/rootfs
-/path/to/test/rootfs/var/cache/fontconfig/*
-
-Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
- fc-cache/fc-cache.c | 63 ---
- fc-cat/fc-cat.c | 77 +++---
- fc-lang/fc-lang.c |1 +
- fontconfig/fontconfig.h |6
- src/fccache.c | 85 +++
- src/fccfg.c | 52 +
- src/fcfreetype.c|4 +++
- src/fcstr.c | 27 +++
- 8 files changed, 285 insertions(+), 30 deletions(-)
-
-diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
-index 9fb383b..a91e1f1 100644
a/fc-cache/fc-cache.c
-+++ b/fc-cache/fc-cache.c
-@@ -68,6 +68,7 @@ const struct option longopts[] = {
- {force, 0, 0, 'f'},
- {really-force, 0, 0, 'r'},
- {system-only, 0, 0, 's'},
-+{sysroot, 1, 0, 'y'},
- {version, 0, 0, 'V'},
- {verbose, 0, 0, 'v'},
- {help, 0, 0, 'h'},
-@@ -85,26 +86,28 @@ usage (char *program, int error)
- {
- FILE *file = error ? stderr : stdout;
- #if HAVE_GETOPT_LONG
--fprintf (file, usage: %s [-frsvVh] [--force|--really-force]
[--system-only] [--verbose] [--version] [--help] [dirs]\n,
-+fprintf (file, usage: %s [-frsvVh] [-y SYSROOT] [--force|--really-force]
[--system-only] [--sysroot=SYSROOT] [--verbose] [--version] [--help] [dirs]\n,
-program);
- #else
--fprintf (file, usage: %s [-frsvVh] [dirs]\n,
-+fprintf (file, usage: %s [-frsvVh] [-y SYSROOT] [dirs]\n,
-program);
- #endif
- fprintf (file, Build font information caches in [dirs]\n
-(all directories in font configuration by default).\n);
- fprintf (file, \n);
- #if HAVE_GETOPT_LONG
--fprintf (file, -f, --force scan directories with apparently
valid caches\n);
--fprintf (file, -r, --really-force erase all existing caches, then
rescan\n);
--fprintf (file, -s, --system-onlyscan system-wide directories
only\n);
--fprintf (file, -v, --verbosedisplay status information while
busy\n);
--fprintf (file, -V, --versiondisplay font config version and
exit\n);
--fprintf (file, -h, --help display this help and exit\n);
-+fprintf (file, -f, --force scan directories with apparently
valid caches\n);
-+fprintf (file, -r, --really-forceerase all existing caches, then
rescan\n);
-+fprintf (file, -s,
