CVS commit: pkgsrc/textproc/xmlstarlet

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 18 06:15:32 UTC 2025

Modified Files:
        pkgsrc/textproc/xmlstarlet: Makefile distinfo
Added Files:
        pkgsrc/textproc/xmlstarlet/patches: patch-src_xml__pyx.c

Log Message:
xmlstarlet: fix build with libxml2 2.14


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/xmlstarlet/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/xmlstarlet/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__pyx.c

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/Makefile
diff -u pkgsrc/textproc/xmlstarlet/Makefile:1.35 pkgsrc/textproc/xmlstarlet/Makefile:1.36
--- pkgsrc/textproc/xmlstarlet/Makefile:1.35    Thu Apr 17 21:52:40 2025
+++ pkgsrc/textproc/xmlstarlet/Makefile Fri Apr 18 06:15:32 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2025/04/17 21:52:40 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.36 2025/04/18 06:15:32 wiz Exp $
 
 DISTNAME=              xmlstarlet-1.6.1
 PKGREVISION=           13

Index: pkgsrc/textproc/xmlstarlet/distinfo
diff -u pkgsrc/textproc/xmlstarlet/distinfo:1.13 pkgsrc/textproc/xmlstarlet/distinfo:1.14
--- pkgsrc/textproc/xmlstarlet/distinfo:1.13    Tue Oct 26 11:23:40 2021
+++ pkgsrc/textproc/xmlstarlet/distinfo Fri Apr 18 06:15:32 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:23:40 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/04/18 06:15:32 wiz 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__pyx.c) = e1fc925748e094de94265e782a18ebf1e9820f7b

Added files:

Index: pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__pyx.c
diff -u /dev/null pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__pyx.c:1.1
--- /dev/null   Fri Apr 18 06:15:32 2025
+++ pkgsrc/textproc/xmlstarlet/patches/patch-src_xml__pyx.c     Fri Apr 18 06:15:32 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_xml__pyx.c,v 1.1 2025/04/18 06:15:32 wiz Exp $
+
+libxml2 defines ATTRIBUTE_UNUSED.
+
+--- src/xml_pyx.c.orig 2025-04-18 06:14:09.644457134 +0000
++++ src/xml_pyx.c
+@@ -200,7 +200,7 @@ pyxExternalEntityReferenceHandler(void* 
+ }
+ 
+ static void
+-pyxExternalSubsetHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
++pyxExternalSubsetHandler(void *ctx XS_ATTRIBUTE_UNUSED, const xmlChar *name,
+                          const xmlChar *ExternalID, const xmlChar *SystemID)
+ {
+     fprintf(stdout, "D %s PUBLIC", name); /* TODO: re-check */
+@@ -215,7 +215,7 @@ pyxExternalSubsetHandler(void *ctx ATTRI
+ }
+ 
+ static void
+-pyxCommentHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value)
++pyxCommentHandler(void *ctx XS_ATTRIBUTE_UNUSED, const xmlChar *value)
+ {
+     fprintf(stdout,"C");
+     SanitizeData(value, xmlStrlen(value));
+@@ -223,7 +223,7 @@ pyxCommentHandler(void *ctx ATTRIBUTE_UN
+ }
+ 
+ static void
+-pyxCdataBlockHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value, int len)
++pyxCdataBlockHandler(void *ctx XS_ATTRIBUTE_UNUSED, const xmlChar *value, int len)
+ {
+     fprintf(stdout,"[");
+     SanitizeData(value, len);