From 34da5307a69647b2dd0199871b18f48c1075f131 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.org>
Date: Mon, 21 Feb 2022 21:37:24 +0100
Subject: [PATCH] tigervnc: source xorg-server-xvfb's build.sh to get configure
 args

Instead of implementing custom function in the build recipe.

%ci:no-build
---
 x11-packages/tigervnc/build.sh         | 3 ++-
 x11-packages/xorg-server-xvfb/build.sh | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh
index e6e608612..759dc93e5 100644
--- a/x11-packages/tigervnc/build.sh
+++ b/x11-packages/tigervnc/build.sh
@@ -45,13 +45,14 @@ termux_step_pre_configure() {
 	CPPFLAGS="${CPPFLAGS} -I${TERMUX_PREFIX}/include/libdrm"
 	LDFLAGS="${LDFLAGS} -llog"
 
+	local xorg_server_xvfb_configure_args="$(. $TERMUX_SCRIPTDIR/packages/xorg-server-xvfb/build.sh; echo $TERMUX_PKG_EXTRA_CONFIGURE_ARGS)"
 	./configure \
 		--host="${TERMUX_HOST_PLATFORM}" \
 		--prefix="${TERMUX_PREFIX}" \
 		--disable-static \
 		--disable-nls \
 		--enable-debug \
-		`TERMUX_PREFIX=${TERMUX_PREFIX} bash ${TERMUX_SCRIPTDIR}/packages/xorg-server-xvfb/build.sh xorg_server_flags`
+		${xorg_server_xvfb_configure_args}
 
 	LDFLAGS="${LDFLAGS} -landroid-shmem"
 
diff --git a/x11-packages/xorg-server-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh
index deafbdc96..379ec4811 100644
--- a/x11-packages/xorg-server-xvfb/build.sh
+++ b/x11-packages/xorg-server-xvfb/build.sh
@@ -70,8 +70,3 @@ termux_step_pre_configure() {
 		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-debug"
 	fi
 }
-
-## The following is required for package 'tigervnc'.
-if [ "${#}" -eq 1 ] && [ "${1}" == "xorg_server_flags" ]; then
-	echo ${TERMUX_PKG_EXTRA_CONFIGURE_ARGS}
-fi