From 4a4db98e9db84094604231baa144fe17ed381b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 4 Jul 2020 19:26:27 +0700
Subject: [PATCH] anjuta: build with python3, enable gir in cross-compile

---
 srcpkgs/anjuta/patches/python.patch | 11 +++++++++++
 srcpkgs/anjuta/patches/vala.patch   | 11 +++++++++++
 srcpkgs/anjuta/template             | 21 +++++++++++++--------
 3 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/anjuta/patches/python.patch
 create mode 100644 srcpkgs/anjuta/patches/vala.patch

diff --git a/srcpkgs/anjuta/patches/python.patch b/srcpkgs/anjuta/patches/python.patch
new file mode 100644
index 0000000000..e186512572
--- /dev/null
+++ b/srcpkgs/anjuta/patches/python.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2020-07-04 20:59:04.718066026 +0700
++++ configure.ac	2020-07-04 20:59:54.542554633 +0700
+@@ -370,7 +370,7 @@
+ 	[have_python="no"])
+ 
+ if test x$have_python = xyes; then
+-	if test -x $PYTHON-config; then
++	if $PYTHON-config --cflags; then
+ 		PYTHON_CFLAGS=`$PYTHON-config --cflags`
+ 		PYTHON_LIBS=`$PYTHON-config --libs`
+ 		AC_SUBST(PYTHON_CFLAGS)
diff --git a/srcpkgs/anjuta/patches/vala.patch b/srcpkgs/anjuta/patches/vala.patch
new file mode 100644
index 0000000000..178ed45b5a
--- /dev/null
+++ b/srcpkgs/anjuta/patches/vala.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2020-07-04 20:32:36.223805943 +0700
++++ configure.ac	2020-07-04 20:33:01.432033914 +0700
+@@ -338,7 +338,7 @@
+ else
+         AC_MSG_RESULT(no)
+ 	AC_MSG_CHECKING(if libvala is available)
+-	m4_foreach([VERSION], [[0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
++	m4_foreach([VERSION], [[0.48], [0.46], [0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
+ 		[PKG_CHECK_EXISTS([ libvala-VERSION ],
+ 			 [ valaver="-VERSION" ])
+ 			 ])
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index d27ec038fc..eb73aee88d 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,16 +1,20 @@
 # Template file for 'anjuta'
 pkgname=anjuta
 version=3.34.0
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper="gir qemu"
 configure_args="--disable-compile-warnings --disable-schemas-compile
+ PYTHON=python3
+ SVN_INCLUDES=$XBPS_CROSS_BASE/usr/include SVN_LIBS=$XBPS_CROSS_BASE/usr/lib
  $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool flex itstool python autogen glib-devel
- $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
+ libtool automake gettext-devel gnome-common yelp-tools which gtk-doc
+ vala-devel $(vopt_if gir gobject-introspection)"
 makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
  libxslt-devel glade3-devel graphviz-devel vala-devel
  libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel"
 depends="autogen"
 short_desc="GNOME Integrated Development Environment"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -20,10 +24,11 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f
 
 build_options="gir"
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options_default="gir"
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 anjuta-devel_package() {
 	replaces="anjuta-docs>=0"