From fd4729c42d75aa8006c53abf4d65dbef34877d18 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: Wed, 23 Feb 2022 09:39:01 +0700
Subject: [PATCH] libxml2: change homepage, merge libxml2-python3 back

The homepage was picked up from specs file.
---
 srcpkgs/libxml2-python3                       |  1 +
 srcpkgs/libxml2-python3/template              | 26 -----------------
 .../patches/python3-utf8.patch                |  0
 srcpkgs/libxml2/template                      | 28 +++++++++++++------
 4 files changed, 20 insertions(+), 35 deletions(-)
 create mode 120000 srcpkgs/libxml2-python3
 delete mode 100644 srcpkgs/libxml2-python3/template
 rename srcpkgs/{libxml2-python3 => libxml2}/patches/python3-utf8.patch (100%)

diff --git a/srcpkgs/libxml2-python3 b/srcpkgs/libxml2-python3
new file mode 120000
index 00000000000..0ccd6d6e543
--- /dev/null
+++ b/srcpkgs/libxml2-python3
@@ -0,0 +1 @@
+libxml2
\ No newline at end of file
diff --git a/srcpkgs/libxml2-python3/template b/srcpkgs/libxml2-python3/template
deleted file mode 100644
index 4db662975d2..00000000000
--- a/srcpkgs/libxml2-python3/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libxml2-python3'
-pkgname=libxml2-python3
-version=2.9.13
-revision=1
-wrksrc="libxml2-${version}"
-build_wrksrc=python
-build_style=python3-module
-hostmakedepends="python3-devel"
-makedepends="libxml2-devel python3-devel"
-depends="python3"
-short_desc="Library providing XML and HTML support - Python3 bindings"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="https://download.gnome.org/sources/libxml2/${version%.*}/libxml2-${version}.tar.xz"
-checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
-
-post_patch() {
-	if [ "${CROSS_BUILD}" ]; then
-		vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:"
-	fi
-}
-
-post_install() {
-	vlicense ../COPYING
-}
diff --git a/srcpkgs/libxml2-python3/patches/python3-utf8.patch b/srcpkgs/libxml2/patches/python3-utf8.patch
similarity index 100%
rename from srcpkgs/libxml2-python3/patches/python3-utf8.patch
rename to srcpkgs/libxml2/patches/python3-utf8.patch
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index e2d76ceec88..be660f81aa0 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,22 +1,23 @@
 # Template file for 'libxml2'
-#
-# Please keep this in sync with "srcpkgs/libxml2-python3"
-#
 pkgname=libxml2
 version=2.9.13
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-threads --with-history --with-icu --without-python"
-hostmakedepends="gettext pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel"
+configure_args="--with-threads --with-history --with-icu"
+hostmakedepends="gettext pkg-config python3"
+makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel
+ python3-devel"
 short_desc="Library providing XML and HTML support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="https://download.gnome.org/sources/libxml2/${version%.*}/libxml2-${version}.tar.xz"
+homepage="https://gitlab.gnome.org/GNOME/libxml2"
+distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz"
 checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
+python_version=3
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 
 post_install() {
+	rm -f ${DESTDIR}/${py3_lib}/*.a
 	vlicense COPYING
 }
 
@@ -35,6 +36,15 @@ libxml2-devel_package() {
 		vmove "usr/share/man/man1/xml2-config*"
 		vmove usr/share/man/man3
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.la"
 		vmove "usr/lib/*.so"
 	}
 }
+
+libxml2-python3_package() {
+	depends="python3 ${sourcepkg}>=${version}"
+	short_desc+=" - Python bindings"
+	pkg_install() {
+		vmove "${py3_lib}"
+	}
+}