diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 9b33a8c5e4a..d332eefed4e 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,31 +1,27 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.56.2
+version=2.58.0
 revision=1
-build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --with-pcre=system --enable-static"
-hostmakedepends="automake libtool pkg-config perl python3 libxslt docbook-xsl"
+build_style=meson
+configure_args="-Dfam=false -Dman=true -Dselinux=false"
+hostmakedepends="pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+checkdepends="desktop-file-utils shared-mime-info tzdata"
 short_desc="The GNU library of C routines"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=d64abd16813501c956c4e123ae79f47f1b58de573df9fdd3b0795f1e2c1aa789
+checksum=c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
-	case "$XBPS_TARGET_MACHINE" in
-		mips*)	# It seems common/environment/configure/autoconf_cache/mips-linux is not read?
-			configure_args+=" glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no glib_cv_uscore=no" ;;
-	esac
+else
+	hostmakedepends+=" gtk-doc"
+	configure_args+=" -Dgtk_doc=true"
 fi
 
-pre_configure() {
-	autoreconf -fi
-}
-
 libglib-devel_package() {
 	depends="${makedepends} glib>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -33,7 +29,6 @@ libglib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/glib-2.0
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
@@ -57,8 +52,12 @@ glib-devel_package() {
 		vmove usr/share/man/man1/gdbus-codegen.1
 		vmove usr/share/man/man1/glib-genmarshal.1
 		vmove usr/share/man/man1/gtester-report.1
-		for f in gtk-doc aclocal glib-2.0 gdb; do
+		for f in glib-2.0 gdb; do
 			vmove usr/share/${f}
 		done
+
+		if [ -z "$CROSS_BUILD" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }