From 9c87e7472e57e49525668cca35f79a7524aadb42 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 24 Nov 2014 10:01:02 +0100 Subject: [PATCH] gnome-settings-daemon: update to 3.12.3. --- srcpkgs/gnome-settings-daemon/template | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index d52d5575a42..efff882c257 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,24 +1,25 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.12.2 -revision=5 +version=3.12.3 +revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-cups +configure_args="$(vopt_enable gir introspection) --disable-static --enable-cups --disable-schemas-compile --disable-packagekit" -hostmakedepends="pkg-config intltool libxslt docbook-xsl" +hostmakedepends="pkg-config intltool libxslt docbook-xsl + $(vopt_if gir gobject-introspection)" makedepends="geocode-glib-devel colord-devel>=1.1.7 libxklavier-devel gtk+3-devel libcanberra-devel pulseaudio-devel nss-devel libnotify-devel startup-notification-devel gnome-desktop-devel>=3.12 libgnomekbd-devel xf86-input-wacom-devel libwacom-devel>=0.7 librsvg-devel ibus-devel>=1.5 cups-devel libgudev-devel upower-devel polkit-devel libgweather-devel>=3.12 geoclue2>=2.1" -depends="geoclue2>=2.1 pulseaudio hicolor-icon-theme" +depends="geoclue2>=2.1 pulseaudio hicolor-icon-theme $(vopt_if systemd upower)" short_desc="GNOME settings daemon" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-3" distfiles="${GNOME_SITE}/$pkgname/3.12/$pkgname-$version.tar.xz" -checksum=e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f +checksum=4a92ad7090e76d621be181a48ede75a8da310e86e85d16cd82a9f5cf20297dbc # Package build options build_options="gir systemd" @@ -27,18 +28,6 @@ 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 - -if [ "$build_option_systemd" ]; then - # XXX hard dependency on upower - depends+=" upower" -fi - gnome-settings-daemon-devel_package() { depends="libglib-devel" short_desc+=" - development files"