0ad: minor fixes, maybe fix

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Wed May 3 21:09:55 2023 +0200
Changeset:	ccbe7d133e8e483c1e5cd53470d97bb8c27d470b

Modified Files:
	0ad/Makefile
	0ad/distinfo
	0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
	0ad/patches/patch-source_lib_allocators_page__aligned.cpp
	0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp

Log Message:
0ad: minor fixes, maybe fix

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ccbe7d133e8e483c1e5cd53470d97bb8c27d470b

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

diffstat:
 0ad/Makefile                                       | 22 +++++++++++++++++++---
 0ad/distinfo                                       |  6 +++---
 ...-libraries_source_nvtt_src_src_nvcore_Debug.cpp |  3 +++
 .../patch-source_lib_allocators_page__aligned.cpp  |  3 +++
 .../patch-source_lib_sysdep_os_unix_uvm.cpp        |  3 +++
 5 files changed, 31 insertions(+), 6 deletions(-)

diffs:
diff --git a/0ad/Makefile b/0ad/Makefile
index c3d30c4724..d38bab2d10 100644
--- a/0ad/Makefile
+++ b/0ad/Makefile
@@ -19,13 +19,30 @@ USE_TOOLS+=	gmake perl bash pkg-config
 DEPENDS+=	0ad-data-${PKGVERSION}:../../wip/0ad-data
 DEPENDS+=	premake5-[0-9]*:../../devel/premake5
 
-SUBST_CLASSES+=         	sysincludedir
+SUBST_CLASSES+=			sysincludedir
 SUBST_MESSAGE.sysincludedir=	Fixing "/usr/local" path assumption
 SUBST_STAGE.sysincludedir=	pre-configure
 SUBST_FILES.sysincludedir=	build/premake/extern_libs5.lua
-SUBST_FILES.sysincludedir=	build/premake/premake5.lua
+SUBST_FILES.sysincludedir+=	build/premake/premake5.lua
 SUBST_SED.sysincludedir+=	-e "s,/usr/local/,${PREFIX},g"
 
+# thanks to Guix:
+# 0ad only builds fine with a specific version of mozjs
+# (version 78.6 for 0ad-0.0.25).
+# Here we change the error in case of version mismatch to a warning,
+# and add some minor compatibility fixes.
+SUBST_CLASSES+=		mozjs
+SUBST_MESSAGE.mozjs=	Fixing mozjs version error
+SUBST_STAGE.mozjs=	pre-configure
+SUBST_FILES.mozjs=	source/scriptinterface/ScriptTypes.h
+SUBST_SED.mozjs+=	-e "s,\#error Your compiler is trying to use,\#warning Your compiler is trying to use,g"
+
+SUBST_CLASSES+=		mozjs2
+SUBST_MESSAGE.mozjs2=	Fixing mozjs version error
+SUBST_STAGE.mozjs2=	pre-configure
+SUBST_FILES.mozjs2+=	source/scriptinterface/ScriptContext.cpp
+SUBST_SED.mozjs2+=	-e "s|JS::PrepareZoneForGC(|JS::PrepareZoneForGC(m_cx, |g"
+
 do-configure:
 	${RUN} cd ${WRKSRC}/build/workspaces && ./clean-workspaces.sh
 	${RUN} cd ${WRKSRC}/build/workspaces && ./update-workspaces.sh \
@@ -55,7 +72,6 @@ do-build:
 .include "../../graphics/nvidia-texture-tools/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/mozjs78/buildlink3.mk"
-.include "../../lang/rust/rust.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/enet/buildlink3.mk"
 .include "../../net/miniupnpc/buildlink3.mk"
diff --git a/0ad/distinfo b/0ad/distinfo
index 5a173dfbcd..2c1cc4ac7f 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -13,12 +13,12 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FCDocument_FCDocument.h) = ae
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUCriticalSection.h) = fd181f746bba33ceb917a5de4794296c229213fc
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) = f71f1f361601b2ce561c00a811d33bce6735a06d
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f
-SHA1 (patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp) = b5025ca19e462e3f3c36df167036e68d6bd28cb9
+SHA1 (patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp) = c52106acf026b4a992753e543070e602ad6a25e4
 SHA1 (patch-libraries_source_spidermonkey_build.sh) = 34225c82659cc236bff076301dd52adca9888f92
 SHA1 (patch-source_graphics_TextureConverter.cpp) = d4e3920cd507468adc37dc92e27e6cbb50b5c5e2
-SHA1 (patch-source_lib_allocators_page__aligned.cpp) = 72e04d6f1419fc464e238150c438286bef47f227
+SHA1 (patch-source_lib_allocators_page__aligned.cpp) = c25054afd543a1a90530964a63b2b692b1687765
 SHA1 (patch-source_lib_secure__crt.cpp) = 1e56aa627c8f2343884968ab4ebd4b4eec73b777
-SHA1 (patch-source_lib_sysdep_os_unix_uvm.cpp) = bc7cfbde200f700e19cdee999f58d2f36a41fe76
+SHA1 (patch-source_lib_sysdep_os_unix_uvm.cpp) = 8c460a6ff1049dcf4f6709a1e25f0f3debc10ee8
 SHA1 (patch-source_network_StunClient.cpp) = 6267d44c3d0345d3e47c19746f105657ba984876
 SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
 SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332
diff --git a/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp b/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
index dd627b8a3a..f849ee243c 100644
--- a/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
+++ b/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
@@ -1,3 +1,6 @@
+$NetBSD$
+
+
 --- libraries/source/nvtt/src/src/nvcore/Debug.cpp.orig	2021-02-28 23:45:14 UTC
 +++ libraries/source/nvtt/src/src/nvcore/Debug.cpp
 @@ -628,6 +628,9 @@ namespace 
diff --git a/0ad/patches/patch-source_lib_allocators_page__aligned.cpp b/0ad/patches/patch-source_lib_allocators_page__aligned.cpp
index 87d3081a43..2694574046 100644
--- a/0ad/patches/patch-source_lib_allocators_page__aligned.cpp
+++ b/0ad/patches/patch-source_lib_allocators_page__aligned.cpp
@@ -1,3 +1,6 @@
+$NetBSD$
+
+
 --- source/lib/allocators/page_aligned.cpp.orig	2017-07-28 19:57:26 UTC
 +++ source/lib/allocators/page_aligned.cpp
 @@ -49,7 +49,7 @@ static const int mmap_flags = MAP_PRIVATE|MAP_ANONYMOU
diff --git a/0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp b/0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp
index 09152b8501..a3a6dc8f17 100644
--- a/0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp
+++ b/0ad/patches/patch-source_lib_sysdep_os_unix_uvm.cpp
@@ -1,3 +1,6 @@
+$NetBSD$
+
+
 --- source/lib/sysdep/os/unix/uvm.cpp.orig	2017-07-28 19:57:26 UTC
 +++ source/lib/sysdep/os/unix/uvm.cpp
 @@ -40,7 +40,7 @@ namespace vm {