CVS commit: pkgsrc/games/minetest

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 23 10:08:24 UTC 2024

Modified Files:
        pkgsrc/games/minetest: distinfo
        pkgsrc/games/minetest/patches: patch-src_util_string.cpp

Log Message:
minetest: Fix iconv patch broken in previous update


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/minetest/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/games/minetest/patches/patch-src_util_string.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/minetest/distinfo
diff -u pkgsrc/games/minetest/distinfo:1.13 pkgsrc/games/minetest/distinfo:1.14
--- pkgsrc/games/minetest/distinfo:1.13 Tue Aug 13 14:45:28 2024
+++ pkgsrc/games/minetest/distinfo      Fri Aug 23 10:08:24 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2024/08/13 14:45:28 ktnb Exp $
+$NetBSD: distinfo,v 1.14 2024/08/23 10:08:24 nia Exp $
 
 BLAKE2s (minetest-5.9.0.tar.gz) = 813c7b0218297236239b2d419bb7390e6b9cc491a8aef74f1215c7961b181702
 SHA512 (minetest-5.9.0.tar.gz) = 12f741ffc4e3b44fd19e98b288f8ed42a5a4c48a02f09a2ea712199815e5393bb50a9b6719c367036041094f8922af9c56a70585e9b26085fe96c70869d3cdbf
 Size (minetest-5.9.0.tar.gz) = 11984514 bytes
 SHA1 (patch-irr_src_CIrrDeviceLinux.cpp) = ef1133760dee61aaee8dc59690b7644ce45a3390
 SHA1 (patch-irr_src_os.cpp) = fe5cf12adf6b4574e97e8cfee46a07401b87ab90
-SHA1 (patch-src_util_string.cpp) = e3066cbdccdd4ddbf49b4010703f2629881c411b
+SHA1 (patch-src_util_string.cpp) = 8f93ef740d29a691c6fdd5194ba1893c6df7fe25

Index: pkgsrc/games/minetest/patches/patch-src_util_string.cpp
diff -u pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.7 pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.8
--- pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.7 Tue Aug 13 14:45:28 2024
+++ pkgsrc/games/minetest/patches/patch-src_util_string.cpp     Fri Aug 23 10:08:24 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_util_string.cpp,v 1.7 2024/08/13 14:45:28 ktnb Exp $
+$NetBSD: patch-src_util_string.cpp,v 1.8 2024/08/23 10:08:24 nia Exp $
 
 Support non-POSIX iconv on NetBSD before 10 and SunOS.
 
 --- src/util/string.cpp.orig   2024-08-11 15:54:55.000000000 +0000
 +++ src/util/string.cpp
-@@ -39,6 +39,15 @@ with this program; if not, write to the 
+@@ -39,6 +39,13 @@ with this program; if not, write to the 
        #include <windows.h>
  #endif
  
@@ -12,11 +12,21 @@ Support non-POSIX iconv on NetBSD before
 +#include <sys/param.h>
 +#if __NetBSD_Prereq__(9,99,17)
 +#define NETBSD_POSIX_ICONV 1
-+#else
-+#define NETBSD_POSIX_ICONV 0
 +#endif
 +#endif
 +
  #ifndef _WIN32
  
  namespace {
+@@ -77,7 +84,11 @@ static bool convert(iconv_t cd, char *ou
+       const size_t old_outbuf_size = *outbuf_size;
+       size_t old_size = inbuf_size;
+       while (inbuf_size > 0) {
++#if (defined(__NetBSD__) && !defined(NETBSD_POSIX_ICONV)) || defined(__sun)
++              iconv(cd, (const char *)&inbuf_ptr, &inbuf_size, &outbuf_ptr, outbuf_size);
++#else
+               iconv(cd, &inbuf_ptr, &inbuf_size, &outbuf_ptr, outbuf_size);
++#endif
+               if (inbuf_size == old_size) {
+                       return false;
+               }