CVS commit: pkgsrc/games/minetest

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Tue Aug 13 14:45:28 UTC 2024

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

Log Message:
Fixed issue with patch and luaJIT


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/games/minetest/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/minetest/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    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/Makefile
diff -u pkgsrc/games/minetest/Makefile:1.37 pkgsrc/games/minetest/Makefile:1.38
--- pkgsrc/games/minetest/Makefile:1.37 Mon Aug 12 15:16:03 2024
+++ pkgsrc/games/minetest/Makefile      Tue Aug 13 14:45:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2024/08/12 15:16:03 ktnb Exp $
+# $NetBSD: Makefile,v 1.38 2024/08/13 14:45:28 ktnb Exp $
 
 DISTNAME=      minetest-5.9.0
 CATEGORIES=    games
@@ -29,6 +29,14 @@ CMAKE_ARGS+= -DENABLE_LEVELDB=FALSE
 CMAKE_ARGS+=   -DENABLE_REDIS=FALSE
 CMAKE_ARGS+=   -DENABLE_SPATIAL=FALSE
 
+#.include "../../lang/LuaJIT2/platform.mk"
+#.if ${PLATFORM_SUPPORTS_LUAJIT} == "no"
+#CMAKE_ARGS+=  -DENABLE_LUAJIT=FALSE
+#.endif
+# Binaries built with LuaJIT support have been broken since 2015, see:
+# https://github.com/minetest/minetest/issues/2988
+CMAKE_ARGS+=   -DENABLE_LUAJIT=FALSE
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"

Index: pkgsrc/games/minetest/distinfo
diff -u pkgsrc/games/minetest/distinfo:1.12 pkgsrc/games/minetest/distinfo:1.13
--- pkgsrc/games/minetest/distinfo:1.12 Mon Aug 12 15:16:03 2024
+++ pkgsrc/games/minetest/distinfo      Tue Aug 13 14:45:28 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2024/08/12 15:16:03 ktnb Exp $
+$NetBSD: distinfo,v 1.13 2024/08/13 14:45:28 ktnb 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) = f240efd440fa540c1f767735892b9177089a8f30
+SHA1 (patch-src_util_string.cpp) = e3066cbdccdd4ddbf49b4010703f2629881c411b

Index: pkgsrc/games/minetest/patches/patch-src_util_string.cpp
diff -u pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.6 pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.7
--- pkgsrc/games/minetest/patches/patch-src_util_string.cpp:1.6 Mon Aug 28 07:01:29 2023
+++ pkgsrc/games/minetest/patches/patch-src_util_string.cpp     Tue Aug 13 14:45:28 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_util_string.cpp,v 1.6 2023/08/28 07:01:29 nia Exp $
+$NetBSD: patch-src_util_string.cpp,v 1.7 2024/08/13 14:45:28 ktnb Exp $
 
 Support non-POSIX iconv on NetBSD before 10 and SunOS.
 
---- src/util/string.cpp.orig   2023-04-08 16:04:52.000000000 +0000
+--- 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 
        #include <windows.h>
@@ -19,16 +19,4 @@ Support non-POSIX iconv on NetBSD before
 +
  #ifndef _WIN32
  
- static bool convert(const char *to, const char *from, char *outbuf,
-@@ -54,7 +63,11 @@ static bool convert(const char *to, cons
-       const size_t old_outbuf_size = *outbuf_size;
-       size_t old_size = inbuf_size;
-       while (inbuf_size > 0) {
-+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
-+              iconv(cd, (const char **)&inbuf_ptr, inbuf_left_ptr, &outbuf_ptr, outbuf_size);
-+#else
-               iconv(cd, &inbuf_ptr, inbuf_left_ptr, &outbuf_ptr, outbuf_size);
-+#endif
-               if (inbuf_size == old_size) {
-                       iconv_close(cd);
-                       return false;
+ namespace {