From 6355fa11e8eaa6c31b2fdf63001033d7311cf4cc Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Sat, 9 Feb 2019 19:16:38 +0100
Subject: [PATCH] NetworkManager: enable gir

---
 srcpkgs/NetworkManager/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e6d967e8191..385da75aa86 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,8 +1,9 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=1.14.4
-revision=4
+revision=5
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
  --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
  --with-crypto=gnutls --disable-static --enable-ppp --with-nmtui
@@ -31,8 +32,8 @@ checksum=35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18
 # gtk-doc generation is disabled but gtkdocisze is required by autogen.sh
 hostmakedepends="automake bluez dbus-glib-devel dhclient gettext-devel
  glib-devel gnutls-devel gtk-doc intltool iproute2 iptables libtool
- libxslt-devel pkg-config $(vopt_if gir 'gobject-introspection')
- $(vopt_if gir 'python-gobject') wpa_supplicant"
+ libxslt-devel pkg-config wpa_supplicant
+ $(vopt_if gir 'python-gobject')"
 makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
@@ -62,9 +63,12 @@ esac
 
 # Package build options
 build_options="gir elogind"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" gir"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir" ;;
+esac
+
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
@@ -76,6 +80,10 @@ pre_configure() {
 	sed -e 's,! "$PYTHON" -c ,"$PYTHON" -c,' -i configure
 }
 
+pre_build() {
+	export GIR_EXTRA_LIBS_PATH="${wrksrc}/libnm-util/.libs:${wrksrc}/libnm/.libs:${wrksrc}/libnm-glib/.libs"
+}
+
 do_check() {
 	# src/settings/plugins/ibft/tests/test-ibft errors out in chroot
 	: