During the recent v87.7 release, I was struggling with building upstream skia with newer CI hosts (and newer compilers / c++ headers), it is out now, but I just found that I had the code fix two years ago - patching upstream skia to be more compatible with newer compilers / c++ headers, in a different context, on my own desktop:

For v87
HinTak/skia-building-fun@263da42

For v88
HinTak/skia-building-fun@f8c5868

The compiler error is not indicative of what the fix should be, that's the tricky part.

If we ever need to release v87.8, this should go into the patch/ directory, with scripts/build_* updated to include it.

Cc @pavpanchekha @kyamagu