<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Dec 12, 2016, at 4:45 AM, Burton, Ross <<a href="mailto:ross.burton@intel.com" class="">ross.burton@intel.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Has fallout, for example libxft:<div class=""><br class=""></div><div class="">| ../../libXft-2.3.2/src/xftfreetype.c:675:43: error: ‘FC_CHAR_WIDTH’ undeclared (first use in this function)<br class=""></div><div class=""><br class=""></div></div></div></blockquote><div><br class=""></div><div>OK, I wasn’t aware this is exported API, I will tweak the patch accordingly.</div><br class=""><blockquote type="cite" class=""><div class=""><div dir="ltr" class=""><div class="">Ross</div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On 11 December 2016 at 23:07, Khem Raj <span dir="ltr" class=""><<a href="mailto:raj.khem@gmail.com" target="_blank" class="">raj.khem@gmail.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">glibc 2.25 will come with TS 18661-1 macro definitions in limits.h which ends with following errors<br class="">
<br class="">
| ../../fontconfig-2.12.1/src/<wbr class="">fcmatch.c:324:63: error: 'PRI_CHAR_WIDTH_STRONG' undeclared here (not in a function)<br class="">
| #define FC_OBJECT(NAME, Type, Cmp) { FC_##NAME##_OBJECT, Cmp, PRI_##NAME##_STRONG, PRI_##NAME##_WEAK },<br class="">
| ^<br class="">
| ../../fontconfig-2.12.1/src/<wbr class="">fcobjs.h:54:1: note: in expansion of macro 'FC_OBJECT'<br class="">
| FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)<br class="">
| ^~~~~~~~~<br class="">
| ../../fontconfig-2.12.1/src/<wbr class="">fcmatch.c:324:84: error: 'PRI_CHAR_WIDTH_WEAK' undeclared here (not in a function)<br class="">
| #define FC_OBJECT(NAME, Type, Cmp) { FC_##NAME##_OBJECT, Cmp, PRI_##NAME##_STRONG, PRI_##NAME##_WEAK },<br class="">
| ^<br class="">
| ../../fontconfig-2.12.1/src/<wbr class="">fcobjs.h:54:1: note: in expansion of macro 'FC_OBJECT'<br class="">
| FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)<br class="">
| ^~~~~~~~~<br class="">
| make[3]: *** [Makefile:632: fcmatch.lo] Error 1<br class="">
<br class="">
Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" class="">raj.khem@gmail.com</a>><br class="">
---<br class="">
...icts-with-integer-width-<wbr class="">macros-from-TS-18.patch | 74 ++++++++++++++++++++++<br class="">
.../fontconfig/<a href="http://fontconfig_2.12.1.bb/" rel="noreferrer" target="_blank" class="">fontconfig_2.<wbr class="">12.1.bb</a> | 1 +<br class="">
2 files changed, 75 insertions(+)<br class="">
create mode 100644 meta/recipes-graphics/<wbr class="">fontconfig/fontconfig/0001-<wbr class="">Avoid-conflicts-with-integer-<wbr class="">width-macros-from-TS-18.patch<br class="">
<br class="">
diff --git a/meta/recipes-graphics/<wbr class="">fontconfig/fontconfig/0001-<wbr class="">Avoid-conflicts-with-integer-<wbr class="">width-macros-from-TS-18.patch b/meta/recipes-graphics/<wbr class="">fontconfig/fontconfig/0001-<wbr class="">Avoid-conflicts-with-integer-<wbr class="">width-macros-from-TS-18.patch<br class="">
new file mode 100644<br class="">
index 0000000..326ff3c<br class="">
--- /dev/null<br class="">
+++ b/meta/recipes-graphics/<wbr class="">fontconfig/fontconfig/0001-<wbr class="">Avoid-conflicts-with-integer-<wbr class="">width-macros-from-TS-18.patch<br class="">
@@ -0,0 +1,74 @@<br class="">
+From 20cddc824c6501c2082cac41b162c3<wbr class="">4cd5fcc530 Mon Sep 17 00:00:00 2001<br class="">
+From: Khem Raj <<a href="mailto:raj.khem@gmail.com" class="">raj.khem@gmail.com</a>><br class="">
+Date: Sun, 11 Dec 2016 14:32:00 -0800<br class="">
+Subject: [PATCH] Avoid conflicts with integer width macros from TS<br class="">
+ 18661-1:2014<br class="">
+<br class="">
+glibc 2.25+ has now defined these macros in <limits.h><br class="">
+<a href="https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a" rel="noreferrer" target="_blank" class="">https://sourceware.org/git/?<wbr class="">p=glibc.git;a=commit;h=<wbr class="">5b17fd0da62bf923cb61d1bb7b08cf<wbr class="">2e1f1f9c1a</a><br class="">
+<br class="">
+Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" class="">raj.khem@gmail.com</a>><br class="">
+---<br class="">
+Upstream-Status: Submitted<br class="">
+<br class="">
+ fontconfig/fontconfig.h | 2 +-<br class="">
+ src/fcobjs.h | 2 +-<br class="">
+ src/fcobjshash.gperf | 2 +-<br class="">
+ src/fcobjshash.h | 2 +-<br class="">
+ 4 files changed, 4 insertions(+), 4 deletions(-)<br class="">
+<br class="">
+diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h<br class="">
+index 5c72b22..843c532 100644<br class="">
+--- a/fontconfig/fontconfig.h<br class="">
++++ b/fontconfig/fontconfig.h<br class="">
+@@ -128,7 +128,7 @@ typedef int FcBool;<br class="">
+ #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION<br class="">
+<br class="">
+ /* Adjust outline rasterizer */<br class="">
+-#define FC_CHAR_WIDTH "charwidth" /* Int */<br class="">
++#define FC_CHARWIDTH "charwidth" /* Int */<br class="">
+ #define FC_CHAR_HEIGHT "charheight"/* Int */<br class="">
+ #define FC_MATRIX "matrix" /* FcMatrix */<br class="">
+<br class="">
+diff --git a/src/fcobjs.h b/src/fcobjs.h<br class="">
+index 1fc4f65..d27864b 100644<br class="">
+--- a/src/fcobjs.h<br class="">
++++ b/src/fcobjs.h<br class="">
+@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)<br class="">
+ FC_OBJECT (RGBA, FcTypeInteger, NULL)<br class="">
+ FC_OBJECT (SCALE, FcTypeDouble, NULL)<br class="">
+ FC_OBJECT (MINSPACE, FcTypeBool, NULL)<br class="">
+-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)<br class="">
++FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)<br class="">
+ FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)<br class="">
+ FC_OBJECT (MATRIX, FcTypeMatrix, NULL)<br class="">
+ FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)<br class="">
+diff --git a/src/fcobjshash.gperf b/src/fcobjshash.gperf<br class="">
+index 80a0237..eb4ad84 100644<br class="">
+--- a/src/fcobjshash.gperf<br class="">
++++ b/src/fcobjshash.gperf<br class="">
+@@ -44,7 +44,7 @@ int id;<br class="">
+ "rgba",FC_RGBA_OBJECT<br class="">
+ "scale",FC_SCALE_OBJECT<br class="">
+ "minspace",FC_MINSPACE_OBJECT<br class="">
+-"charwidth",FC_CHAR_WIDTH_<wbr class="">OBJECT<br class="">
++"charwidth",FC_CHARWIDTH_<wbr class="">OBJECT<br class="">
+ "charheight",FC_CHAR_HEIGHT_<wbr class="">OBJECT<br class="">
+ "matrix",FC_MATRIX_OBJECT<br class="">
+ "charset",FC_CHARSET_OBJECT<br class="">
+diff --git a/src/fcobjshash.h b/src/fcobjshash.h<br class="">
+index 5a4d1ea..4e66bb0 100644<br class="">
+--- a/src/fcobjshash.h<br class="">
++++ b/src/fcobjshash.h<br class="">
+@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char *str, register unsigned int len)<br class="">
+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_<wbr class="">str43,FC_CHARSET_OBJECT},<br class="">
+ {-1},<br class="">
+ #line 47 "fcobjshash.gperf"<br class="">
+- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_<wbr class="">str45,FC_CHAR_WIDTH_OBJECT},<br class="">
++ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_<wbr class="">str45,FC_CHARWIDTH_OBJECT},<br class="">
+ #line 48 "fcobjshash.gperf"<br class="">
+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_<wbr class="">str46,FC_CHAR_HEIGHT_OBJECT},<br class="">
+ #line 55 "fcobjshash.gperf"<br class="">
+--<br class="">
+2.10.2<br class="">
+<br class="">
diff --git a/meta/recipes-graphics/<wbr class="">fontconfig/<a href="http://fontconfig_2.12.1.bb/" rel="noreferrer" target="_blank" class="">fontconfig_2.12.1.<wbr class="">bb</a> b/meta/recipes-graphics/<wbr class="">fontconfig/<a href="http://fontconfig_2.12.1.bb/" rel="noreferrer" target="_blank" class="">fontconfig_2.12.1.<wbr class="">bb</a><br class="">
index 115f558..8616154 100644<br class="">
--- a/meta/recipes-graphics/<wbr class="">fontconfig/<a href="http://fontconfig_2.12.1.bb/" rel="noreferrer" target="_blank" class="">fontconfig_2.12.1.<wbr class="">bb</a><br class="">
+++ b/meta/recipes-graphics/<wbr class="">fontconfig/<a href="http://fontconfig_2.12.1.bb/" rel="noreferrer" target="_blank" class="">fontconfig_2.12.1.<wbr class="">bb</a><br class="">
@@ -22,6 +22,7 @@ DEPENDS = "expat freetype zlib"<br class="">
<br class="">
SRC_URI = "<a href="http://fontconfig.org/release/fontconfig-${PV}.tar.gz" rel="noreferrer" target="_blank" class="">http://fontconfig.org/<wbr class="">release/fontconfig-${PV}.tar.<wbr class="">gz</a> \<br class="">
<a href="file:///revert-static-" class="">file://revert-static-</a><wbr class="">pkgconfig.patch \<br class="">
+ <a href="file:///0001-Avoid-conflicts-" class="">file://0001-Avoid-conflicts-</a><wbr class="">with-integer-width-macros-<wbr class="">from-TS-18.patch \<br class="">
"<br class="">
SRC_URI[md5sum] = "<wbr class="">ce55e525c37147eee14cc2de6cc09f<wbr class="">6c"<br class="">
SRC_URI[sha256sum] = "<wbr class="">a9f42d03949f948a3a4f762287dbc1<wbr class="">6e53a927c91a07ee64207ebd90a9e5<wbr class="">e292"<br class="">
<span class="HOEnZb"><font color="#888888" class="">--<br class="">
2.10.2<br class="">
<br class="">
--<br class="">
______________________________<wbr class="">_________________<br class="">
Openembedded-core mailing list<br class="">
<a href="mailto:Openembedded-core@lists.openembedded.org" class="">Openembedded-core@lists.<wbr class="">openembedded.org</a><br class="">
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank" class="">http://lists.openembedded.org/<wbr class="">mailman/listinfo/openembedded-<wbr class="">core</a><br class="">
</font></span></blockquote></div><br class=""></div>
</div></blockquote></div><br class=""></body></html>