CVS commit: pkgsrc/games/minetest

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Feb 18 16:46:51 UTC 2020

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

Log Message:
Fix iconv fallout on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/minetest/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.2 pkgsrc/games/minetest/distinfo:1.3
--- pkgsrc/games/minetest/distinfo:1.2  Mon Oct 28 12:54:25 2019
+++ pkgsrc/games/minetest/distinfo      Tue Feb 18 16:46:51 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/10/28 12:54:25 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/02/18 16:46:51 joerg Exp $
 
 SHA1 (minetest-5.1.0/minetest-game.tar.gz) = 4376ed746279de2659d9ac3e42cec4ce596aa248
 RMD160 (minetest-5.1.0/minetest-game.tar.gz) = c6fd1ae580dc71ccb8b25f86e5229cf579d92b77
@@ -11,4 +11,4 @@ Size (minetest-5.1.0/minetest.tar.gz) = 
 SHA1 (patch-CMakeLists.txt) = 50ceef7b158a92900c8d5b6b178d1ab0570e16b1
 SHA1 (patch-src_noise.h) = 54e72bf65fb642542985b1eb5dcd45fb3da4a57f
 SHA1 (patch-src_threading_thread.cpp) = c5334a9fd1e5a65cfa0828b47ebd8e50ba1ed7d7
-SHA1 (patch-src_util_string.cpp) = 152488b322764a788b1fa8858cc7034887741534
+SHA1 (patch-src_util_string.cpp) = 2004c4a9792586d477e8ee9c44c08b5a184a6cd3

Index: pkgsrc/games/minetest/patches/patch-src_util_string.cpp
diff -u pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.1 pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.2
--- pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.1 Sun Jun 30 22:27:22 2019
+++ pkgsrc/games/minetest/patches/patch-src_util_string.cpp     Tue Feb 18 16:46:51 2020
@@ -1,10 +1,25 @@
-$NetBSD: patch-src_util_string.cpp,v 1.1 2019/06/30 22:27:22 nia Exp $
+$NetBSD: patch-src_util_string.cpp,v 1.2 2020/02/18 16:46:51 joerg Exp $
 
 Work around iconv("UTF-8", "WCHAR_T") failing on NetBSD.
 
---- src/util/string.cpp.orig   2019-03-31 20:57:45.000000000 +0000
+--- src/util/string.cpp.orig   2019-10-12 13:48:58.000000000 +0000
 +++ src/util/string.cpp
-@@ -79,6 +79,12 @@ bool convert(const char *to, const char 
+@@ -38,9 +38,11 @@ with this program; if not, write to the 
+       #include <windows.h>
+ #endif
+ 
+-#if defined(_ICONV_H_) && (defined(__FreeBSD__) || defined(__NetBSD__) || \
+-      defined(__OpenBSD__) || defined(__DragonFly__))
+-      #define BSD_ICONV_USED
++#ifdef __NetBSD__
++#  include <sys/param.h>
++#  if __NetBSD_Version__ <= 999001500
++#  define BSD_ICONV_USED
++#  endif
+ #endif
+ 
+ static bool parseHexColorString(const std::string &value, video::SColor &color,
+@@ -79,6 +81,12 @@ bool convert(const char *to, const char 
        return true;
  }
  
@@ -17,7 +32,7 @@ Work around iconv("UTF-8", "WCHAR_T") fa
  std::wstring utf8_to_wide(const std::string &input)
  {
        size_t inbuf_size = input.length() + 1;
-@@ -104,8 +110,9 @@ std::wstring utf8_to_wide(const std::str
+@@ -104,8 +112,9 @@ std::wstring utf8_to_wide(const std::str
  
        return out;
  }