CVS commit: pkgsrc/sysutils/vcdimager

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov 23 07:04:32 UTC 2025

Modified Files:
        pkgsrc/sysutils/vcdimager: Makefile distinfo
        pkgsrc/sysutils/vcdimager/patches:
            patch-frontends_xml_vcd__xml__common.c

Log Message:
vcdimager: fix to arch patch for fixing build with libxml2.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/vcdimager/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/vcdimager/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c

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

Modified files:

Index: pkgsrc/sysutils/vcdimager/Makefile
diff -u pkgsrc/sysutils/vcdimager/Makefile:1.44 pkgsrc/sysutils/vcdimager/Makefile:1.45
--- pkgsrc/sysutils/vcdimager/Makefile:1.44     Fri Apr 25 10:42:29 2025
+++ pkgsrc/sysutils/vcdimager/Makefile  Sun Nov 23 07:04:32 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2025/04/25 10:42:29 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2025/11/23 07:04:32 wiz Exp $
 
 DISTNAME=      vcdimager-2.0.1
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GNU:=vcdimager/}
 

Index: pkgsrc/sysutils/vcdimager/distinfo
diff -u pkgsrc/sysutils/vcdimager/distinfo:1.10 pkgsrc/sysutils/vcdimager/distinfo:1.11
--- pkgsrc/sysutils/vcdimager/distinfo:1.10     Fri Apr 25 10:42:29 2025
+++ pkgsrc/sysutils/vcdimager/distinfo  Sun Nov 23 07:04:32 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2025/04/25 10:42:29 wiz Exp $
+$NetBSD: distinfo,v 1.11 2025/11/23 07:04:32 wiz Exp $
 
 BLAKE2s (vcdimager-2.0.1.tar.gz) = 099201033851a4322bd0b0ff6e57e8afa8962021b0b6a9f94ed441fc7dff9b0e
 SHA512 (vcdimager-2.0.1.tar.gz) = 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
 Size (vcdimager-2.0.1.tar.gz) = 1115207 bytes
-SHA1 (patch-frontends_xml_vcd__xml__common.c) = 399abf04cc7d9d0584c946a05a8125f8c171565b
+SHA1 (patch-frontends_xml_vcd__xml__common.c) = 305c43c61d8697350140bd0d36a9b73b57e483fd

Index: pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c
diff -u pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c:1.1 pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c:1.2
--- pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c:1.1        Fri Apr 25 10:42:29 2025
+++ pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c    Sun Nov 23 07:04:32 2025
@@ -1,25 +1,41 @@
-$NetBSD: patch-frontends_xml_vcd__xml__common.c,v 1.1 2025/04/25 10:42:29 wiz Exp $
+$NetBSD: patch-frontends_xml_vcd__xml__common.c,v 1.2 2025/11/23 07:04:32 wiz Exp $
 
-Fix build with libxml2 2.14.
-https://savannah.gnu.org/support/index.php?111233
+Fix build with libxml 2.14.
+https://gitlab.archlinux.org/archlinux/packaging/packages/vcdimager/-/raw/88dc511b7f3dea8fb45e0c2bfa1345a75a088848/libxml214.diff
 
---- frontends/xml/vcd_xml_common.c.orig        2025-04-25 10:37:59.722970842 +0000
+--- frontends/xml/vcd_xml_common.c.orig        2018-01-03 20:17:37.000000000 +0000
 +++ frontends/xml/vcd_xml_common.c
-@@ -242,13 +242,13 @@ _convert (const char in[], const char en
+@@ -242,17 +242,27 @@ _convert (const char in[], const char en
  
    temp = size - 1;
    if (from) {
 -    if (NULL != handler->output)
 -      ret = handler->output (out, &out_size, (const unsigned char *) in, &temp);
-+    if (NULL != handler->output.legacyFunc)
+-    else
++    if (!(handler->flags & 2) && NULL != handler->output.func)
++      ret = handler->output.func (handler->outputCtxt, out, &out_size, (const unsigned char *) in, &temp, 1);
++    if ((handler->flags & 2) && NULL != handler->output.legacyFunc)
 +      ret = handler->output.legacyFunc (out, &out_size, (const unsigned char *) in, &temp);
-     else
++    else {
++      xmlCharEncCloseFunc(handler);
        return strdup(in);
++    }
    } else {
 -    if (NULL != handler->input)
 -      ret = handler->input (out, &out_size, (const unsigned char *) in, &temp);
-+    if (NULL != handler->input.legacyFunc)
+-    else
++    if (!(handler->flags & 2) && NULL != handler->input.func)
++      ret = handler->input.func (handler->inputCtxt, out, &out_size, (const unsigned char *) in, &temp, 1);
++    if ((handler->flags & 2) && NULL != handler->input.legacyFunc)
 +      ret = handler->input.legacyFunc (out, &out_size, (const unsigned char *) in, &temp);
-     else
++    else {
++      xmlCharEncCloseFunc(handler);
        return strdup(in);
++    }
    }
+ 
++  xmlCharEncCloseFunc(handler);
++
+   if (ret < 0 || (temp - size + 1))
+     {
+       free (out);