@Danny

> could you consider updating the patch to incorporate Efraim's changes,
> if desired?

Please find the revised patches attached, for glib and cairo.

Regards,
RG.