From 0e116f4377470d34dd657e2e095ac1b9a2487b35 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Tue, 5 Feb 2019 18:59:49 +0100
Subject: [PATCH] libsoup: enable gir, add vala option

closes #8223

Co-authored-by: maxice8 <thinkabit.ukim@gmail.com>
---
 srcpkgs/libsoup/template | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template
index 65228aae546..e4e046cf297 100644
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@@ -1,13 +1,15 @@
 # Template file for 'libsoup'
 pkgname=libsoup
 version=2.64.2
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-tls-check --disable-static
-$(vopt_if gir '--enable-introspection --enable-vala' '--disable-introspection --disable-vala')"
+ $(vopt_enable gir introspection) $(vopt_enable vala)"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config
- $(vopt_if gir 'gobject-introspection vala-devel')"
-makedepends="libglib-devel libxml2-devel sqlite-devel libpsl-devel"
+ $(vopt_if vala 'vala')"
+makedepends="libglib-devel libxml2-devel sqlite-devel libpsl-devel
+ $(vopt_if vala 'vala-devel')"
 depends="glib-networking"
 short_desc="HTTP library implementation in C"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,12 +20,13 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6
 
 # Package build options
-build_options="gir"
+build_options="gir vala"
 
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 pre_configure() {
 	autoreconf -fi
@@ -42,6 +45,9 @@ libsoup-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0/Soup-2.4.gir
 		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		vmove usr/include/libsoup-2.4
 		vmove usr/share/gtk-doc
 		vmove "usr/lib/libsoup-2.4.so"