From c654774261033adc31b2f3b4a9627a7bd6041a4e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 10 May 2014 09:47:00 +0200
Subject: [PATCH] network-manager-applet: disable gconf migration; added gir
 build option.

---
 srcpkgs/network-manager-applet/template | 33 ++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7165ed695b..66f24eb1e4 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,13 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=0.9.8.10
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-static --without-bluetooth --with-modem-manager-1"
-hostmakedepends="pkg-config intltool gobject-introspection"
-makedepends="GConf-devel libgnome-keyring-devel libsecret-devel
+configure_args="--disable-static --without-bluetooth --with-modem-manager-1 --disable-migration"
+hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
+makedepends="
+ dbus-glib-devel libgnome-keyring-devel libsecret-devel
  NetworkManager-devel>=${version} gtk+3-devel libnotify-devel
  ModemManager-devel polkit-devel libgudev-devel iso-codes"
 depends="iso-codes NetworkManager>=${version} hicolor-icon-theme"
@@ -17,12 +18,30 @@ license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 checksum=46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb
 
+# 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"
+	makedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
 libnm-gtk_package() {
 	short_desc+=" - runtime library"
 	replaces="${sourcepkg}<0.9.1.95"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/girepository-*"
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
 	}
 }
 
@@ -34,6 +53,8 @@ network-manager-applet-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 	}
 }