[arch-commits] Commit in lib32-libxml2/trunk (PKGBUILD libxml2-2.9.10-icu68.patch)

[Evangelos Foutras]

    Date: Saturday, December 19, 2020 @ 10:39:38
  Author: foutrelis
Revision: 779933

Fix build with ICU 68 (patch from FreeBSD)

Added:
  lib32-libxml2/trunk/libxml2-2.9.10-icu68.patch
Modified:
  lib32-libxml2/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    7 +++++--
 libxml2-2.9.10-icu68.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 10:39:07 UTC (rev 779932)
+++ PKGBUILD	2020-12-19 10:39:38 UTC (rev 779933)
@@ -13,8 +13,10 @@
 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")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
+        libxml2-2.9.10-icu68.patch)
+sha256sums=('SKIP'
+            'f02a435761f26ff664041d49f9d05924dc627bf103c7f542feee891f69aa84a2')
 
 pkgver() {
   cd ${_pkgbasename}
@@ -23,6 +25,7 @@
 
 prepare() {
   cd ${_pkgbasename}
+  patch -Np1 -i ../libxml2-2.9.10-icu68.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 

Added: libxml2-2.9.10-icu68.patch
===================================================================
--- libxml2-2.9.10-icu68.patch	                        (rev 0)
+++ libxml2-2.9.10-icu68.patch	2020-12-19 10:39:38 UTC (rev 779933)
@@ -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
+