commit: ffcf01ad268f711faa94fcb5f7d5b3e22ad4a567 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Oct 30 22:27:50 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Oct 30 22:33:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcf01ad
dev-libs/libxml2: Add patch to fix build with icu-68.1 Closes: https://bugs.gentoo.org/751922 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../libxml2/files/libxml2-2.9.10-remove-TRUE.patch | 31 ++++++++++++++++++++++ dev-libs/libxml2/libxml2-2.9.10-r3.ebuild | 2 ++ 2 files changed, 33 insertions(+) diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch new file mode 100644 index 00000000000..e405feb37c3 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/751922 +https://gitlab.gnome.org/GNOME/libxml2/-/issues/202 + +From c1bae734f3850f6900cf54d186ca0a9102895d82 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomia...@gentoo.org> +Date: Fri, 30 Oct 2020 10:27:23 +0100 +Subject: [PATCH] Fix build with icu-68.1 + +icu-68.1 removed macro definitions for TRUE and FALSE + +Signed-off-by: Lars Wendler <polynomia...@gentoo.org> +--- + encoding.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/encoding.c b/encoding.c +index ad4d8a63..ea1fa99e 100644 +--- a/encoding.c ++++ b/encoding.c +@@ -1958,7 +1958,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 { +-- +2.29.2 + diff --git a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild index 360bcffb202..916abdd469c 100644 --- a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild @@ -78,6 +78,8 @@ src_prepare() { # Patches needed for prefix support eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch + eapply "${FILESDIR}"/${P}-remove-TRUE.patch + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c # Fix build for Windows platform
