diff --git a/srcpkgs/gitg/patches/vala.patch b/srcpkgs/gitg/patches/vala.patch
new file mode 100644
index 0000000000..15cefa4944
--- /dev/null
+++ b/srcpkgs/gitg/patches/vala.patch
@@ -0,0 +1,29 @@
+--- libgitg/gitg-diff-view-file-selectable.vala	2019-07-25 13:13:01.000000000 +0200
++++ libgitg/gitg-diff-view-file-selectable.vala	2020-09-06 14:36:26.374965220 +0200
+@@ -54,7 +54,7 @@
+ 
+ 		buffer.get_start_iter(out iter);
+ 
+-		while (buffer.forward_iter_to_source_mark(ref iter, d_selection_category))
++		while (buffer.forward_iter_to_source_mark(iter, d_selection_category))
+ 		{
+ 			ret += iter.get_line();
+ 		}
+@@ -321,7 +321,7 @@
+ 
+ 		var buffer = source_view.buffer as Gtk.SourceBuffer;
+ 
+-		if (!buffer.forward_iter_to_source_mark(ref iter, "header"))
++		if (!buffer.forward_iter_to_source_mark(iter, "header"))
+ 		{
+ 			iter.forward_to_end();
+ 		}
+@@ -493,7 +493,7 @@
+ 		}
+ 		else
+ 		{
+-			something_selected = (buffer as Gtk.SourceBuffer).forward_iter_to_source_mark(ref iter, d_selection_category);
++			something_selected = (buffer as Gtk.SourceBuffer).forward_iter_to_source_mark(iter, d_selection_category);
+ 		}
+ 
+ 		if (something_selected != has_selection)
diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index 6be8608c0b..0e6fffaac5 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -3,6 +3,7 @@ pkgname=gitg
 version=3.32.1
 revision=3
 build_style=meson
+build_helper="qemu"
 hostmakedepends="intltool gettext glib-devel gobject-introspection pkg-config vala"
 makedepends="gtksourceview-devel libgit2-glib-devel libgee08-devel gtkspell3-devel
  webkit2gtk-devel libpeas-devel gsettings-desktop-schemas-devel libsecret-devel
@@ -14,4 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gitg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a
-nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/20045/steps/shell_3/logs/stdio"
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+fi