[PATCH 0/2] Fix build with glib-2.73.2