[patch] Patch for 2.11.1-r2

fontconfig-2.11.1-avoid-conflicts-with-integer-width-macros-from-TS-18.patch (text/plain), 2.58 KB, created by Brian G. Olson on 2018-01-12 21:08:29 UTC

From: https://raw.githubusercontent.com/openembedded/openembedded-core/e82a7f879419828b42b5cc71e6229c8235090f21/meta/recipes-graphics/fontconfig/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch

diff -Naurp fontconfig-2.11.1/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
--- a/fontconfig/fontconfig.h	2014-03-24 01:03:12.000000000 -0500
+++ b/fontconfig/fontconfig.h	2018-01-11 16:33:04.732521527 -0600
@@ -123,7 +123,8 @@ typedef int		FcBool;
 #define FC_USER_CACHE_FILE	    ".fonts.cache-" FC_CACHE_VERSION
 
 /* Adjust outline rasterizer */
-#define FC_CHAR_WIDTH	    "charwidth"	/* Int */
+#define FC_CHARWIDTH	    "charwidth"	/* Int */
+#define FC_CHAR_WIDTH       FC_CHARWIDTH
 #define FC_CHAR_HEIGHT	    "charheight"/* Int */
 #define FC_MATRIX	    "matrix"    /* FcMatrix */
 
diff -Naurp fontconfig-2.11.1/src/fcobjs.h b/src/fcobjs.h
--- a/src/fcobjs.h	2014-01-20 02:14:20.000000000 -0600
+++ b/src/fcobjs.h	2018-01-11 16:33:31.349482226 -0600
@@ -51,7 +51,7 @@ FC_OBJECT (DPI,			FcTypeDouble,	NULL)
 FC_OBJECT (RGBA,		FcTypeInteger,	NULL)
 FC_OBJECT (SCALE,		FcTypeDouble,	NULL)
 FC_OBJECT (MINSPACE,		FcTypeBool,	NULL)
-FC_OBJECT (CHAR_WIDTH,		FcTypeInteger,	NULL)
+FC_OBJECT (CHARWIDTH,		FcTypeInteger,	NULL)
 FC_OBJECT (CHAR_HEIGHT,		FcTypeInteger,	NULL)
 FC_OBJECT (MATRIX,		FcTypeMatrix,	NULL)
 FC_OBJECT (CHARSET,		FcTypeCharSet,	FcCompareCharSet)
diff -Naurp fontconfig-2.11.1/src/fcobjshash.gperf b/src/fcobjshash.gperf
--- a/src/fcobjshash.gperf	2014-01-22 03:47:18.000000000 -0600
+++ b/src/fcobjshash.gperf	2018-01-11 16:34:03.686434497 -0600
@@ -44,7 +44,7 @@ int id;
 "rgba",FC_RGBA_OBJECT
 "scale",FC_SCALE_OBJECT
 "minspace",FC_MINSPACE_OBJECT
-"charwidth",FC_CHAR_WIDTH_OBJECT
+"charwidth",FC_CHARWIDTH_OBJECT
 "charheight",FC_CHAR_HEIGHT_OBJECT
 "matrix",FC_MATRIX_OBJECT
 "charset",FC_CHARSET_OBJECT
diff -Naurp fontconfig-2.11.1/src/fcobjshash.h b/src/fcobjshash.h
--- a/src/fcobjshash.h	2014-01-22 03:47:18.000000000 -0600
+++ b/src/fcobjshash.h	2018-01-11 16:34:32.468392031 -0600
@@ -275,7 +275,7 @@ FcObjectTypeLookup (register const char
 #line 26 "fcobjshash.gperf"
       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_WIDTH_OBJECT},
 #line 47 "fcobjshash.gperf"
-      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_CHAR_WIDTH_OBJECT},
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_CHARWIDTH_OBJECT},
 #line 48 "fcobjshash.gperf"
       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_CHAR_HEIGHT_OBJECT},
 #line 44 "fcobjshash.gperf"