From 6b5ec16a950ae327f84c710bd21978e665086fcf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 12 Oct 2014 10:40:02 +0200 Subject: [PATCH] GConf: depend on dconf at run-time; to save gsettings on disk. --- srcpkgs/GConf/template | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template index 2a30ea0fca2..79b0764b32e 100644 --- a/srcpkgs/GConf/template +++ b/srcpkgs/GConf/template @@ -1,13 +1,15 @@ # Template file for 'GConf' pkgname=GConf version=3.2.6 -revision=5 +revision=6 build_style=gnu-configure configure_args="--without-openldap --enable-gtk --enable-defaults-service - --disable-orbit --enable-gsettings-backend --disable-static" + --disable-orbit --enable-gsettings-backend --disable-static + $(vopt_enable gir introspection)" conf_files="/etc/gconf/2/path" -hostmakedepends="libtool pkg-config intltool glib-devel" +hostmakedepends="libtool pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel" +depends="dconf" short_desc="A process-transparent configuration system" maintainer="Juan RP " homepage="http://projects.gnome.org/gconf" @@ -23,13 +25,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -if [ "$build_option_gir" ]; then - configure_args+=" --enable-introspection" - makedepends+=" gobject-introspection" -else - configure_args+=" --disable-introspection" -fi - pre_configure() { libtoolize -f } @@ -59,6 +54,6 @@ GConf-devel_package() { vmove usr/share/aclocal vmove usr/share/gtk-doc # Install gconf-merge-schema - vinstall ${FILESDIR}/gconf-merge-schema.sh 755 usr/bin gconf-merge-schema + vbin ${FILESDIR}/gconf-merge-schema.sh gconf-merge-schema } }