| 1 |
commit: ffcf01ad268f711faa94fcb5f7d5b3e22ad4a567 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 30 22:27:50 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 30 22:33:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcf01ad |
| 7 |
|
| 8 |
dev-libs/libxml2: Add patch to fix build with icu-68.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/751922 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
.../libxml2/files/libxml2-2.9.10-remove-TRUE.patch | 31 ++++++++++++++++++++++ |
| 14 |
dev-libs/libxml2/libxml2-2.9.10-r3.ebuild | 2 ++ |
| 15 |
2 files changed, 33 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..e405feb37c3 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch |
| 22 |
@@ -0,0 +1,31 @@ |
| 23 |
+https://bugs.gentoo.org/751922 |
| 24 |
+https://gitlab.gnome.org/GNOME/libxml2/-/issues/202 |
| 25 |
+ |
| 26 |
+From c1bae734f3850f6900cf54d186ca0a9102895d82 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Lars Wendler <polynomial-c@g.o> |
| 28 |
+Date: Fri, 30 Oct 2020 10:27:23 +0100 |
| 29 |
+Subject: [PATCH] Fix build with icu-68.1 |
| 30 |
+ |
| 31 |
+icu-68.1 removed macro definitions for TRUE and FALSE |
| 32 |
+ |
| 33 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 34 |
+--- |
| 35 |
+ encoding.c | 2 +- |
| 36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 37 |
+ |
| 38 |
+diff --git a/encoding.c b/encoding.c |
| 39 |
+index ad4d8a63..ea1fa99e 100644 |
| 40 |
+--- a/encoding.c |
| 41 |
++++ b/encoding.c |
| 42 |
+@@ -1958,7 +1958,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, |
| 43 |
+ #ifdef LIBXML_ICU_ENABLED |
| 44 |
+ else if (handler->uconv_out != NULL) { |
| 45 |
+ ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, |
| 46 |
+- TRUE); |
| 47 |
++ 1); |
| 48 |
+ } |
| 49 |
+ #endif /* LIBXML_ICU_ENABLED */ |
| 50 |
+ else { |
| 51 |
+-- |
| 52 |
+2.29.2 |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild |
| 56 |
index 360bcffb202..916abdd469c 100644 |
| 57 |
--- a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild |
| 58 |
+++ b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild |
| 59 |
@@ -78,6 +78,8 @@ src_prepare() { |
| 60 |
# Patches needed for prefix support |
| 61 |
eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch |
| 62 |
|
| 63 |
+ eapply "${FILESDIR}"/${P}-remove-TRUE.patch |
| 64 |
+ |
| 65 |
eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
| 66 |
|
| 67 |
# Fix build for Windows platform |
Archives