CVS commit: pkgsrc/sysutils/vcdimager

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 25 10:42:29 UTC 2025

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

Log Message:
vcdimager: fix build with libxml2 2.14


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/sysutils/vcdimager/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/vcdimager/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.43 pkgsrc/sysutils/vcdimager/Makefile:1.44
--- pkgsrc/sysutils/vcdimager/Makefile:1.43     Thu Apr 17 21:52:31 2025
+++ pkgsrc/sysutils/vcdimager/Makefile  Fri Apr 25 10:42:29 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2025/04/17 21:52:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.44 2025/04/25 10:42:29 wiz Exp $
 
 DISTNAME=      vcdimager-2.0.1
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GNU:=vcdimager/}
 
@@ -13,9 +12,9 @@ LICENSE=      gnu-gpl-v2
 
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake pkg-config
-GNU_CONFIGURE=         YES
-USE_LIBTOOL=           YES
-INFO_FILES=            YES
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+INFO_FILES=            yes
 PKGCONFIG_OVERRIDE+=   libvcdinfo.pc.in
 
 .include "../../mk/bsd.prefs.mk"
@@ -24,11 +23,8 @@ PKGCONFIG_OVERRIDE+= libvcdinfo.pc.in
 BUILDLINK_TRANSFORM+=  rm:-Wl,--version-script=libvcdinfo.la.ver
 .endif
 
-BUILDLINK_API_DEPENDS.libcdio+=        libcdio>=0.72
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/vcdimager/distinfo
diff -u pkgsrc/sysutils/vcdimager/distinfo:1.9 pkgsrc/sysutils/vcdimager/distinfo:1.10
--- pkgsrc/sysutils/vcdimager/distinfo:1.9      Tue Oct 26 11:20:21 2021
+++ pkgsrc/sysutils/vcdimager/distinfo  Fri Apr 25 10:42:29 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:20:21 nia Exp $
+$NetBSD: distinfo,v 1.10 2025/04/25 10:42:29 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

Added files:

Index: pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c
diff -u /dev/null pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c:1.1
--- /dev/null   Fri Apr 25 10:42:29 2025
+++ pkgsrc/sysutils/vcdimager/patches/patch-frontends_xml_vcd__xml__common.c    Fri Apr 25 10:42:29 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-frontends_xml_vcd__xml__common.c,v 1.1 2025/04/25 10:42:29 wiz Exp $
+
+Fix build with libxml2 2.14.
+https://savannah.gnu.org/support/index.php?111233
+
+--- frontends/xml/vcd_xml_common.c.orig        2025-04-25 10:37:59.722970842 +0000
++++ frontends/xml/vcd_xml_common.c
+@@ -242,13 +242,13 @@ _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)
++      ret = handler->output.legacyFunc (out, &out_size, (const unsigned char *) in, &temp);
+     else
+       return strdup(in);
+   } else {
+-    if (NULL != handler->input)
+-      ret = handler->input (out, &out_size, (const unsigned char *) in, &temp);
++    if (NULL != handler->input.legacyFunc)
++      ret = handler->input.legacyFunc (out, &out_size, (const unsigned char *) in, &temp);
+     else
+       return strdup(in);
+   }