[arch-commits] Commit in lib32-libxml2/repos/multilib-x86_64 (3 files)

[Levente Polyak]

    Date: Wednesday, September 8, 2021 @ 22:30:33
  Author: anthraxx
Revision: 1012982

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-libxml2/repos/multilib-x86_64/PKGBUILD
    (from rev 1012981, lib32-libxml2/trunk/PKGBUILD)
Deleted:
  lib32-libxml2/repos/multilib-x86_64/PKGBUILD
  lib32-libxml2/repos/multilib-x86_64/libxml2-2.9.10-icu68.patch

----------------------------+
 PKGBUILD                   |  124 ++++++++++++++++++++++---------------------
 libxml2-2.9.10-icu68.patch |   28 ---------
 2 files changed, 66 insertions(+), 86 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-08 22:30:29 UTC (rev 1012981)
+++ PKGBUILD	2021-09-08 22:30:33 UTC (rev 1012982)
@@ -1,58 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-_pkgbasename=libxml2
-pkgname=lib32-$_pkgbasename
-pkgver=2.9.10
-pkgrel=4
-pkgdesc='XML parsing library, version 2 (32-bit)'
-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')
-
-pkgver() {
-  cd ${_pkgbasename}
-  git describe --always --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd ${_pkgbasename}
-  patch -Np1 -i ../libxml2-2.9.10-icu68.patch
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${_pkgbasename}
-
-  ./configure \
-    --prefix=/usr \
-    --with-threads \
-    --with-history \
-    --with-icu \
-    --libdir=/usr/lib32
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
-  make
-}
-
-package() {
-  cd ${_pkgbasename}
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh"
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-# vim: ts=2 sw=2 et:

Copied: lib32-libxml2/repos/multilib-x86_64/PKGBUILD (from rev 1012981, lib32-libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-09-08 22:30:33 UTC (rev 1012982)
@@ -0,0 +1,66 @@
+# 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.12
+pkgrel=1
+pkgdesc='XML parsing library, version 2 (32-bit)'
+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=b48e77cf4f6fa0792c5f4b639707a2b0675e461b  # tags/v2.9.12^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd ${_pkgbasename}
+  git describe --always --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd ${_pkgbasename}
+
+  # 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
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd ${_pkgbasename}
+
+  ./configure \
+    --prefix=/usr \
+    --with-threads \
+    --with-history \
+    --with-icu \
+    --libdir=/usr/lib32
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  make
+}
+
+package() {
+  cd ${_pkgbasename}
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh"
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: libxml2-2.9.10-icu68.patch
===================================================================
--- libxml2-2.9.10-icu68.patch	2021-09-08 22:30:29 UTC (rev 1012981)
+++ libxml2-2.9.10-icu68.patch	2021-09-08 22:30:33 UTC (rev 1012982)
@@ -1,28 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik at algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca44..264f60bb 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
--- 
-GitLab
-