CVS commit: pkgsrc/games/manaplus

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb  1 08:57:16 UTC 2024

Modified Files:
        pkgsrc/games/manaplus: distinfo
Added Files:
        pkgsrc/games/manaplus/patches: patch-src_utils_dumplibs.cpp
            patch-src_utils_xml_libxml.inc

Log Message:
manaplus: fix build with libxml2 2.12.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/manaplus/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp \
    pkgsrc/games/manaplus/patches/patch-src_utils_xml_libxml.inc

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

Modified files:

Index: pkgsrc/games/manaplus/distinfo
diff -u pkgsrc/games/manaplus/distinfo:1.4 pkgsrc/games/manaplus/distinfo:1.5
--- pkgsrc/games/manaplus/distinfo:1.4  Tue Oct 26 10:44:14 2021
+++ pkgsrc/games/manaplus/distinfo      Thu Feb  1 08:57:16 2024
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:44:14 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/02/01 08:57:16 wiz Exp $
 
 BLAKE2s (manaplus-2.1.3.17.tar.xz) = 2dc3f54eeae14df0a11b34dc1dfbe9f7df3266ff4df523771bf35eb923fdebd0
 SHA512 (manaplus-2.1.3.17.tar.xz) = 8473158f55357e199094bb6c88b6645f0044aadd950ae95f213d4276512bff29c0df58765f7127272961ea2bccb5bdca431cbe125d2a22e9510dc691e509aab7
 Size (manaplus-2.1.3.17.tar.xz) = 14132800 bytes
+SHA1 (patch-src_utils_dumplibs.cpp) = bd2a54cc306ed6eea9e36d24c0f054769ad1cbd1
+SHA1 (patch-src_utils_xml_libxml.inc) = b6bb7a2a4db11cae0034f49312bf4086c5b3d599

Added files:

Index: pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp
diff -u /dev/null pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp:1.1
--- /dev/null   Thu Feb  1 08:57:16 2024
+++ pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp  Thu Feb  1 08:57:16 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_utils_dumplibs.cpp,v 1.1 2024/02/01 08:57:16 wiz Exp $
+
+Fix build with libxml2 2.12.
+https://gitlab.com/manaplus/manaplus/-/issues/33
+
+--- src/utils/dumplibs.cpp.orig        2024-02-01 08:51:36.691968861 +0000
++++ src/utils/dumplibs.cpp
+@@ -140,7 +140,7 @@ void dumpLibs()
+     LIBXML_TEST_VERSION
+ #endif  // LIBXML_TEST_VERSION
+ #ifdef ENABLE_LIBXML
+-    const char **xmlVersion = __xmlParserVersion();
++    const char * const *xmlVersion = __xmlParserVersion();
+     if (xmlVersion != nullptr)
+         logger->log(" libxml2: %s", *xmlVersion);
+ #endif  // ENABLE_LIBXML
Index: pkgsrc/games/manaplus/patches/patch-src_utils_xml_libxml.inc
diff -u /dev/null pkgsrc/games/manaplus/patches/patch-src_utils_xml_libxml.inc:1.1
--- /dev/null   Thu Feb  1 08:57:16 2024
+++ pkgsrc/games/manaplus/patches/patch-src_utils_xml_libxml.inc        Thu Feb  1 08:57:16 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_utils_xml_libxml.inc,v 1.1 2024/02/01 08:57:16 wiz Exp $
+
+Fix build with libxml2 2.12.
+https://gitlab.com/manaplus/manaplus/-/issues/33
+
+--- src/utils/xml/libxml.inc.orig      2024-02-01 08:54:19.624180650 +0000
++++ src/utils/xml/libxml.inc
+@@ -24,6 +24,7 @@
+ 
+ #ifdef ENABLE_LIBXML
+ 
++#include <libxml/parser.h>
+ #include <libxml/xmlwriter.h>
+ 
+ __XML_XMLWRITER_H__