GConf: always enable gir

srcpkgs/GConf/template

@@ -1,8 +1,9 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=8
+revision=9
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
@@ -11,10 +12,10 @@ hostmakedepends="automake libtool pkg-config gettext-devel intltool gtk-doc
  glib-devel gobject-introspection"
 makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
-short_desc="A process-transparent configuration system"
+short_desc="Process-transparent configuration system"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-homepage="http://projects.gnome.org/gconf"
 license="GPL-2"
+homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
 make_dirs="/usr/share/gconf/schemas 0755 root root
@@ -24,11 +25,7 @@ make_dirs="/usr/share/gconf/schemas 0755 root root
 
 # Package build options
 build_options="gir"
-
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options_default="gir"
 
 pre_configure() {
 	autoreconf -if