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

[Felix Yan]

    Date: Thursday, April 15, 2021 @ 16:20:26
  Author: felixonmars
Revision: 919154

archrelease: copy trunk to multilib-staging-x86_64

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

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

Copied: lib32-libxml2/repos/multilib-staging-x86_64/PKGBUILD (from rev 919153, lib32-libxml2/trunk/PKGBUILD)
===================================================================
--- multilib-staging-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-staging-x86_64/PKGBUILD	2021-04-15 16:20:26 UTC (rev 919154)
@@ -0,0 +1,58 @@
+# 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-staging-x86_64/libxml2-2.9.10-icu68.patch (from rev 919153, lib32-libxml2/trunk/libxml2-2.9.10-icu68.patch)
===================================================================
--- multilib-staging-x86_64/libxml2-2.9.10-icu68.patch	                        (rev 0)
+++ multilib-staging-x86_64/libxml2-2.9.10-icu68.patch	2021-04-15 16:20:26 UTC (rev 919154)
@@ -0,0 +1,28 @@
+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
+