From ab6c31e0ac6722f5cc2a45fe926d5b45310a7c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 19 May 2020 21:55:50 +0700
Subject: [PATCH 1/2] libxslt: remove $XBPS_CROSS_BASE reference from
 pkg-config

Partial-fixes: #19642
---
 srcpkgs/libxslt/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index a488405bdb9..c35af48b073 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,7 +1,7 @@
 # Template file for 'libxslt'
 pkgname=libxslt
 version=1.1.34
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --disable-dependency-tracking"
 hostmakedepends="libtool"
@@ -34,7 +34,15 @@ post_configure() {
 
 post_install() {
 	# Remove references to the install(1) wrapper.
-	sed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i ${DESTDIR}/usr/bin/xslt-config
+	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i ${DESTDIR}/usr/bin/xslt-config
+	if [ "$CROSS_BUILD" ]; then
+		# Remove $XBPS_CROSS_BASE in pkg-config
+		vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
+			$DESTDIR/usr/bin/xslt-config \
+			$DESTDIR/usr/lib/xsltConf.sh \
+			$DESTDIR/usr/lib/pkgconfig/libxslt.pc \
+			$DESTDIR/usr/lib/pkgconfig/libexslt.pc
+	fi
 	vlicense COPYING
 }
 
@@ -56,7 +64,6 @@ libxslt-devel_package() {
 libxslt-python_package() {
 	lib32disabled=yes
 	short_desc+=" - python extension"
-	pycompile_module="libxslt.py"
 	pkg_install() {
 		vmove "usr/lib/python*"
 		vmove usr/share/doc/${sourcepkg}-python-${version}

From f19e237764cda9d3b1ba615ae46bc8ceceb9bab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 19 May 2020 21:55:50 +0700
Subject: [PATCH 2/2] xmlsec1: remove $XBPS_CROSS_BASE reference from
 pkg-config

Partial-fixes: #19642
---
 srcpkgs/xmlsec1/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 1f28d8c0803..6f77396dec1 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.30
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel
@@ -19,7 +19,10 @@ pre_configure() {
 
 post_install() {
 	if [ "$CROSS_BUILD" ]; then
-		vsed -e "s,${XBPS_CROSS_BASE},,g" -i ${DESTDIR}/usr/lib/xmlsec1Conf.sh
+		vsed -e "s,${XBPS_CROSS_BASE},,g" -i \
+			$DESTDIR/usr/bin/xmlsec1-config \
+			$DESTDIR/usr/lib/xmlsec1Conf.sh \
+			$DESTDIR/usr/lib/pkgconfig/xmlsec1-gnutls.pc
 	fi
 
 	vlicense COPYING