diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2024-03-07 12:37:14 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-03-08 10:07:28 -0800 |
| commit | 6b0da50505e8d12bb8c0e56ff88a02714f0dca29 (patch) | |
| tree | 75729d92921c5cb1d23ab0fdc33418bd9e497818 /meta-oe | |
| parent | 18e019ee2295ab42849e510d5efeee94bf1d9056 (diff) | |
| download | meta-openembedded-contrib-6b0da50505e8d12bb8c0e56ff88a02714f0dca29.tar.gz | |
xmlstarlet: Fix build with API breakage in libxml2 2.12
Fixes
| 300 | xmlSetStructuredErrorFunc(&errorInfo, reportError);
| | ^~~~~~~~~~~
| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/xmlstarlet/1.6.1/recipe-sysroot/usr/lib/../include/libxml2/libxml/xmlerror.h:898:29: note: passing argument to parameter 'handler' here
| 898 | xmlStructuredErrorFunc handler);
| | ^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch | 45 | ||||
| -rw-r--r-- | meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch new file mode 100644 index 0000000000..a9d98db69c --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch @@ -0,0 +1,45 @@ +From f7a5ebc3a673b246a64c9a664df304c1520a3951 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Mar 2024 12:35:17 -0800 +Subject: [PATCH] Make xmlError struct constant + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml.c | 2 +- + src/xmlstar.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xml.c b/src/xml.c +index cf47cc2..e6f19c1 100644 +--- a/src/xml.c ++++ b/src/xml.c +@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) { + /* by default all errors are reported */ + static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE }; + +-void reportError(void *ptr, xmlErrorPtr error) ++void reportError(void *ptr, const xmlError *error) + { + ErrorInfo *errorInfo = (ErrorInfo*) ptr; + assert(errorInfo); +diff --git a/src/xmlstar.h b/src/xmlstar.h +index 3e1eed3..7e41ac4 100644 +--- a/src/xmlstar.h ++++ b/src/xmlstar.h +@@ -32,7 +32,7 @@ typedef struct _errorInfo { + ErrorStop stop; + } ErrorInfo; + +-void reportError(void *ptr, xmlErrorPtr error); ++void reportError(void *ptr, const xmlError* error); + void suppressErrors(void); + + typedef struct _gOptions { +-- +2.44.0 + diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index 930fbdd6c7..61eeaaa095 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -15,6 +15,7 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Make-xmlError-struct-constant.patch \ file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" |