gtk-vnc: enable gir, cleanup template

srcpkgs/gtk-vnc/template

@@ -1,23 +1,27 @@
 # Template file for 'gtk-vnc'
 pkgname=gtk-vnc
 version=0.9.0
-revision=1
-configure_args="$(vopt_enable gir introspection)"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection
- intltool libgcrypt-devel libtool pkg-config"
+revision=2
+build_helper="gir"
+build_style=gnu-configure
+configure_args="$(vopt_enable gir introspection) $(vopt_enable vala)"
+hostmakedepends="automake gettext-devel glib-devel intltool libgcrypt-devel
+ libtool pkg-config gobject-introspection $(vopt_if vala vala)"
 makedepends="gnutls-devel gtk+-devel gtk+3-devel libsasl-devel
- $(vopt_if gir 'vala-devel')"
+ $(vopt_if vala 'vala')"
 short_desc="VNC viewer widget for GTK"
-maintainer="Juan RP <xtraeme@voidlinux.org>"
+maintainer="Rasmus Thomsen <oss@cogitri.dev>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/gtk-vnc"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=3a9a88426809a5df2c14353cd9839b8c8163438cb708b31d8048c79d180fcab7
 
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options="gir vala"
+case "$XBPS_TARGET_MACHINE" in
+	i686-musl|x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 post_extract() {
 	cp -a ${wrksrc} /tmp/gtk2-build
@@ -41,12 +45,10 @@ pre_configure() {
 
 do_configure() {
 	cd ${wrksrc}/gtk2-build
-	./configure ${configure_args} --disable-static \
-		--with-gtk=2.0 $(vopt_enable gir introspection)
+	./configure ${configure_args} --with-gtk=2.0
 
 	cd ${wrksrc}/gtk3-build
-	./configure ${configure_args} --disable-static \
-		--with-gtk=3.0 $(vopt_enable gir introspection)
+	./configure ${configure_args} --with-gtk=3.0
 }
 
 do_build() {