CVS commit: pkgsrc/games/manaplus

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 25 08:12:38 UTC 2025

Modified Files:
        pkgsrc/games/manaplus: distinfo
        pkgsrc/games/manaplus/patches: patch-src_utils_dumplibs.cpp
Added Files:
        pkgsrc/games/manaplus/patches: patch-src_progs_dyecmd_client.cpp
            patch-src_resources_wallpaper.cpp

Log Message:
manaplus: fix build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/manaplus/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/manaplus/patches/patch-src_progs_dyecmd_client.cpp \
    pkgsrc/games/manaplus/patches/patch-src_resources_wallpaper.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp

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.5 pkgsrc/games/manaplus/distinfo:1.6
--- pkgsrc/games/manaplus/distinfo:1.5  Thu Feb  1 08:57:16 2024
+++ pkgsrc/games/manaplus/distinfo      Fri Apr 25 08:12:38 2025
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2024/02/01 08:57:16 wiz Exp $
+$NetBSD: distinfo,v 1.6 2025/04/25 08:12:38 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_progs_dyecmd_client.cpp) = ad303f0235fce006282ff0072c9209842f8bf998
+SHA1 (patch-src_resources_wallpaper.cpp) = d9a4ddfcebf4f97cd59c0831f3f5f74a30ea3418
+SHA1 (patch-src_utils_dumplibs.cpp) = 428fbec78223502b77aae4e4c7fef05243bc26ca
 SHA1 (patch-src_utils_xml_libxml.inc) = b6bb7a2a4db11cae0034f49312bf4086c5b3d599

Index: pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp
diff -u pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp:1.1 pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp:1.2
--- pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp:1.1      Thu Feb  1 08:57:16 2024
+++ pkgsrc/games/manaplus/patches/patch-src_utils_dumplibs.cpp  Fri Apr 25 08:12:38 2025
@@ -1,16 +1,32 @@
-$NetBSD: patch-src_utils_dumplibs.cpp,v 1.1 2024/02/01 08:57:16 wiz Exp $
+$NetBSD: patch-src_utils_dumplibs.cpp,v 1.2 2025/04/25 08:12:38 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.orig        2021-01-27 20:14:00.000000000 +0000
 +++ src/utils/dumplibs.cpp
-@@ -140,7 +140,7 @@ void dumpLibs()
+@@ -140,9 +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);
+-    if (xmlVersion != nullptr)
+-        logger->log(" libxml2: %s", *xmlVersion);
++    logger->log(" libxml2: %s", xmlParserVersion);
  #endif  // ENABLE_LIBXML
+ #ifdef USE_SDL2
+     SDL_version sdlVersion;
+@@ -161,11 +159,11 @@ void dumpLibs()
+ 
+     compareVersions("zLib", ZLIB_VERSION, zlibVersion());
+ #ifdef ENABLE_LIBXML
+-    if (xmlVersion != nullptr)
++    if (xmlParserVersion != nullptr)
+     {
+         compareVersions("libxml2",
+             LIBXML_VERSION_STRING LIBXML_VERSION_EXTRA,
+-            *xmlVersion);
++            xmlParserVersion);
+     }
+ #endif  // ENABLE_LIBXML
+ #ifdef USE_SDL2

Added files:

Index: pkgsrc/games/manaplus/patches/patch-src_progs_dyecmd_client.cpp
diff -u /dev/null pkgsrc/games/manaplus/patches/patch-src_progs_dyecmd_client.cpp:1.1
--- /dev/null   Fri Apr 25 08:12:38 2025
+++ pkgsrc/games/manaplus/patches/patch-src_progs_dyecmd_client.cpp     Fri Apr 25 08:12:38 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_progs_dyecmd_client.cpp,v 1.1 2025/04/25 08:12:38 wiz Exp $
+
+Add header for time().
+
+--- src/progs/dyecmd/client.cpp.orig   2025-04-25 07:50:14.418497178 +0000
++++ src/progs/dyecmd/client.cpp
+@@ -88,9 +88,7 @@ PRAGMA48(GCC diagnostic pop)
+ #undef ERROR
+ #endif  // WIN32
+ 
+-#ifdef __clang__
+ #include <ctime>
+-#endif  // __clang__
+ 
+ #ifdef ANDROID
+ #ifndef USE_SDL2
Index: pkgsrc/games/manaplus/patches/patch-src_resources_wallpaper.cpp
diff -u /dev/null pkgsrc/games/manaplus/patches/patch-src_resources_wallpaper.cpp:1.1
--- /dev/null   Fri Apr 25 08:12:38 2025
+++ pkgsrc/games/manaplus/patches/patch-src_resources_wallpaper.cpp     Fri Apr 25 08:12:38 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_resources_wallpaper.cpp,v 1.1 2025/04/25 08:12:38 wiz Exp $
+
+Add header for time().
+
+--- src/resources/wallpaper.cpp.orig   2025-04-25 07:49:24.044195586 +0000
++++ src/resources/wallpaper.cpp
+@@ -39,9 +39,7 @@
+ #include <sys/time.h>
+ #endif  // WIN32
+ 
+-#ifdef __clang__
+ #include <ctime>
+-#endif  // __clang__
+ 
+ #include "debug.h"
+