diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-10-30 18:27:50 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-10-30 18:33:53 -0400 |
| commit | ffcf01ad268f711faa94fcb5f7d5b3e22ad4a567 (patch) | |
| tree | e204f27bc574a14d4bff41caaec1274fa2bea366 /dev-libs/libxml2 | |
| parent | dev-util/catalyst: Remove python3_7 (diff) | |
| download | gentoo-ffcf01ad268f711faa94fcb5f7d5b3e22ad4a567.tar.gz gentoo-ffcf01ad268f711faa94fcb5f7d5b3e22ad4a567.tar.bz2 gentoo-ffcf01ad268f711faa94fcb5f7d5b3e22ad4a567.zip | |
dev-libs/libxml2: Add patch to fix build with icu-68.1
Closes: https://bugs.gentoo.org/751922
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-libs/libxml2')
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch | 31 | ||||
| -rw-r--r-- | dev-libs/libxml2/libxml2-2.9.10-r3.ebuild | 2 |
2 files changed, 33 insertions, 0 deletions
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 000000000000..e405feb37c36 --- /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 <polynomial-c@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 <polynomial-c@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 360bcffb2024..916abdd469c6 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 |