From 0ebb2c79d159b7ba73dea456db9d2f9dc2ec928d Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Mon, 13 Oct 2025 23:09:39 +0300 Subject: [PATCH] dev-util/lttng-tools: adjust patch to be backwards compatible with libxml2-2.13 Closes: https://bugs.gentoo.org/964303 Signed-off-by: Alfred Wingate Part-of: https://github.com/gentoo/gentoo/pull/44168 Closes: https://github.com/gentoo/gentoo/pull/44168 Signed-off-by: Sam James --- .../files/lttng-tools-2.13.0-libxml2-2.14.patch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch b/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch index 76b663965c31..8eaf844e9ddc 100644 --- a/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch +++ b/dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch @@ -1,6 +1,9 @@ https://bugs.gentoo.org/955783 https://github.com/lttng/lttng-tools/pull/170 +Modified to be backwards compatible with libxml2-2.13 +https://bugs.gentoo.org/964303 + From 7d669a90212e105b0f669aa2ab38c987b187baab Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 21 May 2025 13:09:25 +0800 @@ -36,12 +39,15 @@ Signed-off-by: Marko, Peter Signed-off-by: Hongxu Jia --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c -@@ -429,7 +429,7 @@ static xmlChar *encode_string(const char *in_str) +@@ -429,7 +429,11 @@ static xmlChar *encode_string(const char *in_str) goto end; } -- ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len); ++#if LIBXML_VERSION >= 21400 + ret = handler->input.func(NULL, out_str, &out_len, (const xmlChar *) in_str, &in_len, 0); ++#else + ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len); ++#endif if (ret < 0) { xmlFree(out_str); out_str = NULL;