json-glib: update to 1.10.6
[oi-userland.git] / components / library / freetype / patches / 01-GS-conflict.patch
blob476a93e84b16fc570807007c5e537c8aebd5443b
1 Workaround for Solaris bugs:
2 Bug 15320009 - SUNBT6400595 x86 register defines unnecessarily pollute global namespace
3 Bug 15558893 - SUNBT6834287 sys/regset.h included in too many places
5 --- freetype-2.11.1/src/truetype/ttinterp.h.orig 2021-10-15 22:35:44.000000000 +0000
6 +++ freetype-2.11.1/src/truetype/ttinterp.h 2021-12-05 12:12:37.389363018 +0000
7 @@ -176,6 +176,8 @@
8 FT_Size_Metrics metrics; /* ! */
9 TT_Size_Metrics tt_metrics; /* ! size metrics */
11 +#undef GS /* avoid conflict with <sys/regset.h> on Solaris x86 systems */
12 +#define GS FT_GS
13 TT_GraphicsState GS; /* !@ current graphics state */
15 FT_Int iniRange; /* initial code range number */
16 --- freetype-2.11.1/src/truetype/ttobjs.h.orig 2021-02-13 09:16:54.000000000 +0000
17 +++ freetype-2.11.1/src/truetype/ttobjs.h 2021-12-05 11:12:49.618152457 +0000
18 @@ -301,6 +301,8 @@
20 TT_CodeRangeTable codeRangeTable;
22 +#undef GS /* avoid conflict with <sys/regset.h> on Solaris x86 systems */
23 +#define GS FT_GS
24 TT_GraphicsState GS;
26 FT_ULong cvt_size; /* the scaled control value table */