CVS commit: pkgsrc/textproc/xmlstarlet

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu May  1 15:16:21 UTC 2025

Modified Files:
        pkgsrc/textproc/xmlstarlet: distinfo
Added Files:
        pkgsrc/textproc/xmlstarlet/patches: patch-src_xml.c
            patch-src_xml__elem.c patch-src_xmlstar.h

Log Message:
xmlstarlet: sprinkle some const to appease clang and libxml2


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/xmlstarlet/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xmlstarlet/patches/patch-src_xml.c \
    pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__elem.c \
    pkgsrc/textproc/xmlstarlet/patches/patch-src_xmlstar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/xmlstarlet/distinfo
diff -u pkgsrc/textproc/xmlstarlet/distinfo:1.16 pkgsrc/textproc/xmlstarlet/distinfo:1.17
--- pkgsrc/textproc/xmlstarlet/distinfo:1.16    Fri Apr 18 15:39:44 2025
+++ pkgsrc/textproc/xmlstarlet/distinfo Thu May  1 15:16:21 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.16 2025/04/18 15:39:44 wiz Exp $
+$NetBSD: distinfo,v 1.17 2025/05/01 15:16:21 tnn Exp $
 
 BLAKE2s (xmlstarlet-1.6.1.tar.gz) = 41340c6d1baa11adc281a749ee952d61cbcf41e270d15b089f0cfaf20dca7f44
 SHA512 (xmlstarlet-1.6.1.tar.gz) = 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
 Size (xmlstarlet-1.6.1.tar.gz) = 420923 bytes
+SHA1 (patch-src_xml.c) = e86b6955e22999083a2ffdfcc58878cba24b19e3
+SHA1 (patch-src_xml__elem.c) = 0e16bc4fa317d8840bb26551d97f00dfd0bbc051
 SHA1 (patch-src_xml__pyx.c) = 943ddae807b13529da6b09e4d88a81d41df6d1ff
+SHA1 (patch-src_xmlstar.h) = 3a6393184146462a935eac4a8de61a76fe4a5e55

Added files:

Index: pkgsrc/textproc/xmlstarlet/patches/patch-src_xml.c
diff -u /dev/null pkgsrc/textproc/xmlstarlet/patches/patch-src_xml.c:1.1
--- /dev/null   Thu May  1 15:16:21 2025
+++ pkgsrc/textproc/xmlstarlet/patches/patch-src_xml.c  Thu May  1 15:16:21 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_xml.c,v 1.1 2025/05/01 15:16:21 tnn Exp $
+
+* sprinkle some const to appease clang and libxml2
+
+--- src/xml.c.orig     2025-05-01 14:50:59.284458064 +0000
++++ src/xml.c
+@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const
+ /* by default all errors are reported */
+ static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE };
+ 
+-void reportError(void *ptr, xmlErrorPtr error)
++void reportError(void *ptr, const struct _xmlError *error)
+ {
+     ErrorInfo *errorInfo = (ErrorInfo*) ptr;
+     assert(errorInfo);
Index: pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__elem.c
diff -u /dev/null pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__elem.c:1.1
--- /dev/null   Thu May  1 15:16:21 2025
+++ pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__elem.c    Thu May  1 15:16:21 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_xml__elem.c,v 1.1 2025/05/01 15:16:21 tnn Exp $
+
+* sprinkle some const to appease clang and libxml2
+
+--- src/xml_elem.c.orig        2025-05-01 14:44:26.773438402 +0000
++++ src/xml_elem.c
+@@ -178,7 +178,7 @@ elInitOptions(elOptions *ops)
+ }
+ 
+ typedef struct {
+-    xmlChar **array;
++    const xmlChar **array;
+     int offset;
+ } ArrayDest;
+ 
+@@ -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;
Index: pkgsrc/textproc/xmlstarlet/patches/patch-src_xmlstar.h
diff -u /dev/null pkgsrc/textproc/xmlstarlet/patches/patch-src_xmlstar.h:1.1
--- /dev/null   Thu May  1 15:16:21 2025
+++ pkgsrc/textproc/xmlstarlet/patches/patch-src_xmlstar.h      Thu May  1 15:16:21 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_xmlstar.h,v 1.1 2025/05/01 15:16:21 tnn Exp $
+
+* sprinkle some const to appease clang and libxml2
+
+--- src/xmlstar.h.orig 2025-05-01 14:48:24.749356766 +0000
++++ src/xmlstar.h
+@@ -32,7 +32,7 @@ typedef struct _errorInfo {
+     ErrorStop stop;
+ } ErrorInfo;
+ 
+-void reportError(void *ptr, xmlErrorPtr error);
++void reportError(void *ptr, const struct _xmlError *);
+ void suppressErrors(void);
+ 
+ typedef struct _gOptions {