generator: merge xml decl
glib: update