Date: Saturday, December 19, 2020 @ 04:46:38 Author: foutrelis Revision: 404518
upgpkg: libxml2 2.9.10-8: icu 68.2 rebuild Added: libxml2/trunk/libxml2-2.9.10-icu68.patch Modified: libxml2/trunk/PKGBUILD ----------------------------+ PKGBUILD | 6 +++++- libxml2-2.9.10-icu68.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-19 04:04:06 UTC (rev 404517) +++ PKGBUILD 2020-12-19 04:46:38 UTC (rev 404518) @@ -5,7 +5,7 @@ pkgname=libxml2 pkgver=2.9.10 -pkgrel=7 +pkgrel=8 pkgdesc='XML parsing library, version 2' url='http://www.xmlsoft.org/' arch=(x86_64) @@ -21,6 +21,7 @@ libxml2-2.9.10-parenthesize-type-checks.patch libxml2-2.9.10-CVE-2020-24977.patch libxml2-2.9.10-fix-integer-overflow.patch + libxml2-2.9.10-icu68.patch https://www.w3.org/XML/Test/xmlts20130923.tar.gz) sha256sums=('SKIP' '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c' @@ -30,6 +31,7 @@ 'b63c161e4c8a6f0a65ba091c3d3ed09d3110d21f997ee61077c782b311fd4b33' '62eafffc2b4949489c261c63883d27c2e83d688f1d4c899000b283e4c2a682be' 'fd227780ad5699bebca7ef412d2d50fb1d21a54f6e3fdcad0bda5bdc8f8b2525' + 'f02a435761f26ff664041d49f9d05924dc627bf103c7f542feee891f69aa84a2' '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f') pkgver() { @@ -50,6 +52,8 @@ patch -Np1 -i ../libxml2-2.9.10-CVE-2020-24977.patch patch -Np1 -i ../libxml2-2.9.10-fix-integer-overflow.patch + 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 04:46:38 UTC (rev 404518) @@ -0,0 +1,28 @@ +From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001 +From: Frederik Seiffert <[email protected]> +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 +
