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