summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-08-15 13:33:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-17 00:21:14 +0100
commit765c929bec1165d096ba6898fe8a5ac4f7f06fb0 (patch)
tree475377b0687fd0d3b9b4a38243a335bf9059a874
parentd59bda3779513a6d05e0677c141440b1cf8c3702 (diff)
downloadpoky-765c929bec1165d096ba6898fe8a5ac4f7f06fb0.tar.gz
fontconfig: Upgrade 2.12.1 -> 2.12.4
Bug fix upgrades. * Remove one upstreamed patch. * Update a license location. * Add gperf-native as dependency as a hash function header is no longer shipped and must be generated. * Add workaround for a related build issue (reported upstream) (From OE-Core rev: a9762bf5d28d578b9fbcc94c3bdd4866e66fdf97) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch72
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb (renamed from meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb)14
2 files changed, 9 insertions, 77 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
deleted file mode 100644
index cad71707ad..0000000000
--- a/meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 11 Dec 2016 14:32:00 -0800
4Subject: [PATCH] Avoid conflicts with integer width macros from TS
5 18661-1:2014
6
7glibc 2.25+ has now defined these macros in <limits.h>
8https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Submitted
13
14 fontconfig/fontconfig.h | 2 +-
15 src/fcobjs.h | 2 +-
16 src/fcobjshash.gperf | 2 +-
17 src/fcobjshash.h | 2 +-
18 4 files changed, 4 insertions(+), 4 deletions(-)
19
20Index: fontconfig-2.12.1/fontconfig/fontconfig.h
21===================================================================
22--- fontconfig-2.12.1.orig/fontconfig/fontconfig.h
23+++ fontconfig-2.12.1/fontconfig/fontconfig.h
24@@ -128,7 +128,8 @@ typedef int FcBool;
25 #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
26
27 /* Adjust outline rasterizer */
28-#define FC_CHAR_WIDTH "charwidth" /* Int */
29+#define FC_CHARWIDTH "charwidth" /* Int */
30+#define FC_CHAR_WIDTH FC_CHARWIDTH
31 #define FC_CHAR_HEIGHT "charheight"/* Int */
32 #define FC_MATRIX "matrix" /* FcMatrix */
33
34Index: fontconfig-2.12.1/src/fcobjs.h
35===================================================================
36--- fontconfig-2.12.1.orig/src/fcobjs.h
37+++ fontconfig-2.12.1/src/fcobjs.h
38@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)
39 FC_OBJECT (RGBA, FcTypeInteger, NULL)
40 FC_OBJECT (SCALE, FcTypeDouble, NULL)
41 FC_OBJECT (MINSPACE, FcTypeBool, NULL)
42-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
43+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
44 FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)
45 FC_OBJECT (MATRIX, FcTypeMatrix, NULL)
46 FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)
47Index: fontconfig-2.12.1/src/fcobjshash.gperf
48===================================================================
49--- fontconfig-2.12.1.orig/src/fcobjshash.gperf
50+++ fontconfig-2.12.1/src/fcobjshash.gperf
51@@ -44,7 +44,7 @@ int id;
52 "rgba",FC_RGBA_OBJECT
53 "scale",FC_SCALE_OBJECT
54 "minspace",FC_MINSPACE_OBJECT
55-"charwidth",FC_CHAR_WIDTH_OBJECT
56+"charwidth",FC_CHARWIDTH_OBJECT
57 "charheight",FC_CHAR_HEIGHT_OBJECT
58 "matrix",FC_MATRIX_OBJECT
59 "charset",FC_CHARSET_OBJECT
60Index: fontconfig-2.12.1/src/fcobjshash.h
61===================================================================
62--- fontconfig-2.12.1.orig/src/fcobjshash.h
63+++ fontconfig-2.12.1/src/fcobjshash.h
64@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char
65 {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT},
66 {-1},
67 #line 47 "fcobjshash.gperf"
68- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT},
69+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT},
70 #line 48 "fcobjshash.gperf"
71 {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT},
72 #line 55 "fcobjshash.gperf"
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb
index 95b066ce46..a058b35984 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb
@@ -14,18 +14,22 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
14LICENSE = "MIT-style & MIT & PD" 14LICENSE = "MIT-style & MIT & PD"
15LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \ 15LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
16 file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \ 16 file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
17 file://src/fccache.c;beginline=1360;endline=1375;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" 17 file://src/fccache.c;beginline=1367;endline=1382;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
18 18
19SECTION = "libs" 19SECTION = "libs"
20 20
21DEPENDS = "expat freetype zlib" 21DEPENDS = "expat freetype zlib gperf-native"
22 22
23SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 23SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
24 file://revert-static-pkgconfig.patch \ 24 file://revert-static-pkgconfig.patch \
25 file://0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch \
26 " 25 "
27SRC_URI[md5sum] = "ce55e525c37147eee14cc2de6cc09f6c" 26SRC_URI[md5sum] = "4fb01fc3f41760c41c69e37cc784b658"
28SRC_URI[sha256sum] = "a9f42d03949f948a3a4f762287dbc16e53a927c91a07ee64207ebd90a9e5e292" 27SRC_URI[sha256sum] = "fd5a6a663f4c4a00e196523902626654dd0c4a78686cbc6e472f338e50fdf806"
28
29do_configure_prepend() {
30 # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280
31 rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf
32}
29 33
30PACKAGES =+ "fontconfig-utils" 34PACKAGES =+ "fontconfig-utils"
31FILES_${PN} =+ "${datadir}/xml/*" 35FILES_${PN} =+ "${datadir}/xml/*"