diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 00000000000..9ce7da845c3
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23..032188df7f7 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,23 +1,23 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
-hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
- python-devel $(vopt_if vala vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala