From 719e0817b7c6e70757981c5e248479bb56fdd066 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 13 Jan 2015 08:44:38 +0100 Subject: [PATCH] gnome-disk-utility: handle gir/systemd build options correctly. --- srcpkgs/gnome-disk-utility/template | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index fb7f71b0ea..a914f062bb 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,14 +1,16 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility version=3.14.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="pkg-config intltool gnome-doc-utils" +configure_args="--disable-static $(vopt_enable gir introspection) + $(vopt_enable systemd libsystemd-login)" +hostmakedepends="pkg-config intltool gnome-doc-utils + $(vopt_if gir gobject-introspection)" makedepends="liblzma-devel gtk+3-devel libcanberra-devel udisks2-devel libdvdread-devel libsecret-devel libpwquality-devel libnotify-devel - gnome-settings-daemon-devel>=3.12" + gnome-settings-daemon-devel>=3.12 $(vopt_if systemd systemd-devel)" depends="hicolor-icon-theme desktop-file-utils" short_desc="GNOME libraries and applications for dealing with storage devices" maintainer="Juan RP " @@ -19,10 +21,6 @@ checksum=85ee6453e56c97a5c33b7346849016f31df53f9acbe325a046d269242797d32b # Package build options build_options="gir systemd" - -if [ "$build_option_systemd" ]; then - configure_args+=" --enable-libsystemd-login" - makedepends+=" systemd-devel" -else - configure_args+=" --disable-libsystemd-login" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" fi