gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-21 21:17:37 -08:00
Code Issues Projects Releases Wiki Activity

dev-util/lttng-tools: adjust patch to be backwards compatible with libxml2-2.13

Browse Source 
Closes: https://bugs.gentoo.org/964303
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44168
Closes: https://github.com/gentoo/gentoo/pull/44168
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alfred Wingate 2025-10-13 23:09:39 +03:00 committed by Sam James
parent 075290e28a
commit 0ebb2c79d1
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev-util/lttng-tools/files/lttng-tools-2.13.0-libxml2-2.14.patch
View File

@ -1,6 +1,9 @@
https://bugs.gentoo.org/955783 https://bugs.gentoo.org/955783
https://github.com/lttng/lttng-tools/pull/170 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 7d669a90212e105b0f669aa2ab38c987b187baab Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 21 May 2025 13:09:25 +0800 Date: Wed, 21 May 2025 13:09:25 +0800
@ -36,12 +39,15 @@ Signed-off-by: Marko, Peter <Peter.Marko@siemens.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
--- a/src/common/config/session-config.c --- a/src/common/config/session-config.c
+++ b/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; 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); + 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) { if (ret < 0) {
xmlFree(out_str); xmlFree(out_str);
out_str = NULL; out_str = NULL;