One of the prior "extra patches" handled the breakage caused by the version number change in GCC. When I purged all the extra patches, this one got thrown out accidently. Add it back to fix at least the textproc/templates_parser port (and probably others)