Upgrade glib2, remove patch that fails to apply, use sed in it's place