87f60a083d
Also add a conditional BuildRequires: on python3-setuptools for unbundled distutils in Python 3.12 and later.
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
Adjust to structured error callback argument change in libxml2 2.12
|
|
|
|
Submitted upstream: <https://listes.entrouvert.com/arc/lasso/2024-01/msg00000.html>
|
|
|
|
diff --git a/lasso/lasso.c b/lasso/lasso.c
|
|
index 42b7d6bb2392525e..bc75f5e674b5e657 100644
|
|
--- a/lasso/lasso.c
|
|
+++ b/lasso/lasso.c
|
|
@@ -138,7 +138,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
|
#include "types.c"
|
|
|
|
static void
|
|
-lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data, xmlErrorPtr error)
|
|
+lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data,
|
|
+#if LIBXML_VERSION >= 21200
|
|
+ const xmlError *error
|
|
+#else
|
|
+ xmlErrorPtr error
|
|
+#endif
|
|
+ )
|
|
{
|
|
g_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: %s", error->message);
|
|
}
|
|
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
|
|
index bbc87d9f1e7eb20d..4d5fa78a28222f1a 100644
|
|
--- a/lasso/xml/tools.c
|
|
+++ b/lasso/xml/tools.c
|
|
@@ -1450,7 +1450,14 @@ lasso_concat_url_query(const char *url, const char *query)
|
|
}
|
|
}
|
|
|
|
-static void structuredErrorFunc (void *userData, xmlErrorPtr error) {
|
|
+static void structuredErrorFunc (void *userData,
|
|
+#if LIBXML_VERSION >= 21200
|
|
+ const xmlError *error
|
|
+#else
|
|
+ xmlErrorPtr error
|
|
+#endif
|
|
+ )
|
|
+{
|
|
*(int*)userData = error->code;
|
|
}
|
|
|