[arch-commits] Commit in lib32-libxml2/trunk (PKGBUILD)

[Levente Polyak]

    Date: Wednesday, September 8, 2021 @ 22:29:41
  Author: anthraxx
Revision: 1012980

upgpkg: lib32-libxml2 2.9.12-1

Modified:
  lib32-libxml2/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-08 22:03:54 UTC (rev 1012979)
+++ PKGBUILD	2021-09-08 22:29:41 UTC (rev 1012980)
@@ -1,22 +1,21 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: John Proctor <jproctor at prium.net>
 
 _pkgbasename=libxml2
 pkgname=lib32-$_pkgbasename
-pkgver=2.9.10
-pkgrel=4
+pkgver=2.9.12
+pkgrel=1
 pkgdesc='XML parsing library, version 2 (32-bit)'
-url="http://www.xmlsoft.org/"
+url='http://www.xmlsoft.org/'
 arch=(x86_64)
 license=(MIT)
 depends=(lib32-zlib lib32-readline lib32-ncurses lib32-xz lib32-icu libxml2)
 makedepends=(git)
-_commit=41a34e1f4ffae2ce401600dbb5fe43f8fe402641  # tags/v2.9.10^0
-source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
-        libxml2-2.9.10-icu68.patch)
-sha256sums=('SKIP'
-            'f02a435761f26ff664041d49f9d05924dc627bf103c7f542feee891f69aa84a2')
+_commit=b48e77cf4f6fa0792c5f4b639707a2b0675e461b  # tags/v2.9.12^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd ${_pkgbasename}
@@ -25,7 +24,16 @@
 
 prepare() {
   cd ${_pkgbasename}
-  patch -Np1 -i ../libxml2-2.9.10-icu68.patch
+
+  # Work around lxml API abuse
+  git cherry-pick -n 85b1792e37b131e7a51af98a37f92472e8de5f3f
+  # Fix regression in xmlNodeDumpOutputInternal
+  git cherry-pick -n 13ad8736d294536da4cbcd70a96b0a2fbf47070c
+  # Fix XPath recursion limit
+  git cherry-pick -n 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77
+  # Fix whitespace when serializing empty HTML documents
+  git cherry-pick -n 92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f
+
   NOCONFIGURE=1 ./autogen.sh
 }