CVS commit: pkgsrc/textproc/libdom

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov 13 22:26:26 UTC 2025

Modified Files:
        pkgsrc/textproc/libdom: distinfo
Added Files:
        pkgsrc/textproc/libdom/patches: patch-bindings_xml_expat__xmlparser.c
            patch-src_core_node.c patch-src_html_html__document.c

Log Message:
libdom: fix build with gcc 14


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libdom/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/libdom/patches/patch-bindings_xml_expat__xmlparser.c \
    pkgsrc/textproc/libdom/patches/patch-src_core_node.c \
    pkgsrc/textproc/libdom/patches/patch-src_html_html__document.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/libdom/distinfo
diff -u pkgsrc/textproc/libdom/distinfo:1.1 pkgsrc/textproc/libdom/distinfo:1.2
--- pkgsrc/textproc/libdom/distinfo:1.1 Fri Feb  7 16:03:47 2025
+++ pkgsrc/textproc/libdom/distinfo     Thu Nov 13 22:26:26 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1 2025/02/07 16:03:47 pho Exp $
+$NetBSD: distinfo,v 1.2 2025/11/13 22:26:26 wiz Exp $
 
 BLAKE2s (libdom-0.4.2-src.tar.gz) = 64ffd7f5ed1b7f88e943ae7cc6872634cd2321b62340eb8f6a7a99dd363d9e29
 SHA512 (libdom-0.4.2-src.tar.gz) = 85ce95a545c48af2cc082896d8153f016f7452315c67390884181cde19c999c7122c913846d404e40957d07abedc22c5ef8342d69eee139309e7c221d0580bb6
 Size (libdom-0.4.2-src.tar.gz) = 878706 bytes
+SHA1 (patch-bindings_xml_expat__xmlparser.c) = 16e7becbbdf540b489a457a4be17a909d6609721
+SHA1 (patch-src_core_node.c) = 0603d2d68723d394eead3cdda3a8a519fda9d19d
+SHA1 (patch-src_html_html__document.c) = d12ee97d5979ccadc1ca6b8108a0f953bc7014e2

Added files:

Index: pkgsrc/textproc/libdom/patches/patch-bindings_xml_expat__xmlparser.c
diff -u /dev/null pkgsrc/textproc/libdom/patches/patch-bindings_xml_expat__xmlparser.c:1.1
--- /dev/null   Thu Nov 13 22:26:26 2025
+++ pkgsrc/textproc/libdom/patches/patch-bindings_xml_expat__xmlparser.c        Thu Nov 13 22:26:26 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-bindings_xml_expat__xmlparser.c,v 1.1 2025/11/13 22:26:26 wiz Exp $
+
+Fix calloc argument order.
+
+--- bindings/xml/expat_xmlparser.c.orig        2023-12-27 15:52:07.000000000 +0000
++++ bindings/xml/expat_xmlparser.c
+@@ -484,7 +484,7 @@ dom_xml_parser_create(const char *enc, c
+ 
+       UNUSED(int_enc);
+ 
+-      parser = calloc(sizeof(*parser), 1);
++      parser = calloc(1, sizeof(*parser));
+       if (parser == NULL) {
+               msg(DOM_MSG_CRITICAL, mctx, "No memory for parser");
+               return NULL;
Index: pkgsrc/textproc/libdom/patches/patch-src_core_node.c
diff -u /dev/null pkgsrc/textproc/libdom/patches/patch-src_core_node.c:1.1
--- /dev/null   Thu Nov 13 22:26:26 2025
+++ pkgsrc/textproc/libdom/patches/patch-src_core_node.c        Thu Nov 13 22:26:26 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_node.c,v 1.1 2025/11/13 22:26:26 wiz Exp $
+
+Fix calloc argument order.
+
+--- src/core/node.c.orig       2023-12-27 15:52:07.000000000 +0000
++++ src/core/node.c
+@@ -2379,7 +2379,7 @@ static inline dom_exception _dom_event_t
+       if (t == NULL) {
+               /* Create the event target list */
+               size = 64;
+-              t = calloc(sizeof(*t), size);
++              t = calloc(size, sizeof(*t));
+               if (t == NULL) {
+                       return DOM_NO_MEM_ERR;
+               }
Index: pkgsrc/textproc/libdom/patches/patch-src_html_html__document.c
diff -u /dev/null pkgsrc/textproc/libdom/patches/patch-src_html_html__document.c:1.1
--- /dev/null   Thu Nov 13 22:26:26 2025
+++ pkgsrc/textproc/libdom/patches/patch-src_html_html__document.c      Thu Nov 13 22:26:26 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_html_html__document.c,v 1.1 2025/11/13 22:26:26 wiz Exp $
+
+Fix calloc argument order.
+
+--- src/html/html_document.c.orig      2025-11-13 22:25:26.739012429 +0000
++++ src/html/html_document.c
+@@ -134,13 +134,12 @@ dom_exception _dom_html_document_initial
+       doc->cookie = NULL;
+       doc->body = NULL;
+ 
+-      doc->memoised = calloc(sizeof(dom_string *), hds_COUNT);
++      doc->memoised = calloc(hds_COUNT, sizeof(dom_string *));
+       if (doc->memoised == NULL) {
+               error = DOM_NO_MEM_ERR;
+               goto out;
+       }
+-      doc->elements = calloc(sizeof(dom_string *),
+-                      DOM_HTML_ELEMENT_TYPE__COUNT);
++      doc->elements = calloc(DOM_HTML_ELEMENT_TYPE__COUNT, sizeof(dom_string *));
+       if (doc->elements == NULL) {
+               error = DOM_NO_MEM_ERR;
+               goto out;