components/web/firefox/patches/11-freetype-GS-conflict.patch

   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
   4
   5 --- firefox-112.0/modules/freetype2/src/truetype/ttinterp.h.orig
   6 +++ firefox-112.0/modules/freetype2/src/truetype/ttinterp.h
   7 @@ -176,6 +176,8 @@
   8      FT_Size_Metrics    metrics;    /* !                */
   9      TT_Size_Metrics    tt_metrics; /* ! size metrics   */
  10
  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 */
  14
  15      FT_Int             iniRange;  /* initial code range number   */
  16 --- firefox-112.0/modules/freetype2/src/truetype/ttobjs.h.orig
  17 +++ firefox-112.0/modules/freetype2/src/truetype/ttobjs.h
  18 @@ -301,6 +301,8 @@
  19
  20      TT_CodeRangeTable  codeRangeTable;
  21
  22 +#undef GS /* avoid conflict with <sys/regset.h> on Solaris x86 systems */
  23 +#define GS FT_GS
  24      TT_GraphicsState   GS;
  25
  26      FT_ULong           cvt_size;      /* the scaled control value table */
  27