Signed-off-by: Khem Raj <raj.k...@gmail.com> --- .../0001-Fix-hash_key_put-signature.patch | 33 +++++++++++++++++++ .../xmlstarlet/xmlstarlet_1.6.1.bb | 4 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch
diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file mode 100644 index 0000000000..2a766dbb87 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch @@ -0,0 +1,33 @@ +From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.k...@gmail.com> +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.39.1 + 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 e28fd61a03..930fbdd6c7 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -14,8 +14,8 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ - file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" -SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" inherit autotools -- 2.39.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100686): https://lists.openembedded.org/g/openembedded-devel/message/100686 Mute This Topic: https://lists.openembedded.org/mt/96439258/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-