From 99a6cc38ce88a95899014b46ef426b757d9e0791 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 16 Nov 2019 21:57:37 -0600
Subject: [PATCH] folks: unmark nocross

---
 srcpkgs/folks/template | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 9a75a1f3c7b..3310c54fadd 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,11 +1,12 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.13.1
-revision=1
+revision=2
 build_style=meson
-configure_args="-Db_lto=false -Dlibsocialweb-backend=false $(vopt_bool vala vala)"
-hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala vala)
- python $(vopt_if gir gobject-introspection)"
+build_helper=gir
+configure_args="-Db_lto=false -Dlibsocialweb-backend=false"
+hostmakedepends="pkg-config intltool glib-devel vala python gobject-introspection
+ evolution-data-server-devel"
 makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
  libgee08-devel evolution-data-server-devel tracker-devel"
 depends="zeitgeist"
@@ -15,15 +16,6 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=3df1c663b82fe211aead2b31cae1fc41d124e85436375762f6745c45ba46aa5d
-nocross="Needs Vala, which needs evolution-dataserver GIR"
-
-# NOTE: Vala build opt is broken because upstream doesn't package all necessary
-# files in the tarballs, .gir files are missing.
-build_options="gir vala"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir vala"
-fi
 
 folks-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -32,11 +24,7 @@ folks-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		if [ "$build_option_vala" ]; then
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/vala
+		vmove usr/share/gir-1.0
 	}
 }