From 892f80c75f7955af4239344472f50912b5031c9c 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: Thu, 27 Oct 2022 18:59:17 +0700
Subject: [PATCH] tigervnc: fix build after auto create-wrksrc

---
 srcpkgs/tigervnc/template | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template
index 8c1c1d360db..4add2881ac2 100644
--- a/srcpkgs/tigervnc/template
+++ b/srcpkgs/tigervnc/template
@@ -3,6 +3,7 @@ pkgname=tigervnc
 version=1.10.1
 revision=3
 _xorg_version=1.20.0
+create_wrksrc=yes
 build_style=cmake
 hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans"
 makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel
@@ -13,18 +14,29 @@ short_desc="High performance, multi-platform VNC client and server"
 maintainer="Evan Deaubl <evan@deaubl.name>"
 license="GPL-2.0-or-later"
 homepage="https://www.tigervnc.org"
-distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz
+distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz
  ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2"
 checksum="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
  9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6"
 conflicts="turbovnc>=0"
+skip_extraction="xorg-server-${_xorg_version}.tar.gz"
 
-post_configure() {
-	cd ${wrksrc}/unix/xserver
-	cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* .
-	patch -p1 <../xserver120.patch
+post_extract() {
+	mv tigervnc-${version}/* .
+	cp -R xorg-server-${_xorg_version}/* unix/xserver
+}
+
+post_patch() {
+	cd unix/xserver
+	_xorg_version=${_xorg_version%.*}
+	_xorg_version=${_xorg_version/./}
+	patch -p1 <../xserver${_xorg_version}.patch
 	# glvnd changed versioning
 	vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/'
+}
+
+post_configure() {
+	cd unix/xserver
 	autoreconf -fi
 	./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \
 		--with-pic --without-dtrace --disable-static \