upower: added gir build option; cross build support.

srcpkgs/upower/template

@@ -1,12 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
 version=0.9.23
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-backend=linux
 --without-idevice --with-systemdutildir=/usr/lib/systemd
 --with-systemdsystemunitdir=/usr/lib/systemd/system"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel"
 conf_files="/etc/UPower/UPower.conf"
 make_dirs="/var/lib/upower 0755 root root"
@@ -17,9 +17,21 @@ homepage="http://upower.freedesktop.org"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
 checksum=433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b
 
-pre_configure() {
-	sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-}
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
 
 upower-devel_package() {
 	depends="dbus-glib-devel upower>=${version}_${revision}"
@@ -27,7 +39,9 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
+		fi
 		vmove "usr/lib/*.so"
 	}
 }