0ad: Update patches

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Dec 15 16:21:28 2021 +0100
Changeset:	7d25c7b3a44d895b3a12f54b1d8ebcef4cecf4ed

Modified Files:
	0ad/distinfo
	0ad/patches/patch-build_premake_extern__libs5.lua
Added Files:
	0ad/patches/patch-source_scriptinterface_ScriptTypes.h

Log Message:
0ad: Update patches

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

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

diffstat:
 0ad/distinfo                                         |  3 ++-
 0ad/patches/patch-build_premake_extern__libs5.lua    | 10 +++++-----
 .../patch-source_scriptinterface_ScriptTypes.h       | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diffs:
diff --git a/0ad/distinfo b/0ad/distinfo
index 6df7dc8ec6..f07c7861e3 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -4,7 +4,7 @@ SHA1 (0ad-0.0.25b-alpha-unix-build.tar.xz) = 130444c15e29c7fa1333b8719ae7c7da367
 RMD160 (0ad-0.0.25b-alpha-unix-build.tar.xz) = 295ad0f386df10cc95cee7dea889ccd43224dd1e
 SHA512 (0ad-0.0.25b-alpha-unix-build.tar.xz) = e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
 Size (0ad-0.0.25b-alpha-unix-build.tar.xz) = 75579956 bytes
-SHA1 (patch-build_premake_extern__libs5.lua) = 4a0c97a89945d0818fcb22ab09aa329160e727e8
+SHA1 (patch-build_premake_extern__libs5.lua) = e3d804571682c04cada5c39c11313874039ead72
 SHA1 (patch-build_workspaces_clean-workspaces.sh) = fed7e867eb8e24e37860599269f9feb4d30c5a43
 SHA1 (patch-build_workspaces_update-workspaces.sh) = 4a6ec008da64a98230173f3a242cea2503321631
 SHA1 (patch-libraries_source_fcollada_include_FCDocument_FCDocument.h) = 96aef76c02ae4a3f47fdb7c31bf7d11490ba5d09
@@ -16,4 +16,5 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) =
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f
 SHA1 (patch-source_graphics_TextureConverter.cpp) = d4e3920cd507468adc37dc92e27e6cbb50b5c5e2
 SHA1 (patch-source_lib_secure__crt.cpp) = 1e56aa627c8f2343884968ab4ebd4b4eec73b777
+SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
 SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332
diff --git a/0ad/patches/patch-build_premake_extern__libs5.lua b/0ad/patches/patch-build_premake_extern__libs5.lua
index de40e0227b..5282e40cd3 100644
--- a/0ad/patches/patch-build_premake_extern__libs5.lua
+++ b/0ad/patches/patch-build_premake_extern__libs5.lua
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- build/premake/extern_libs5.lua.orig	2016-03-12 18:15:04.000000000 +0000
+--- build/premake/extern_libs5.lua.orig	2021-07-27 21:57:08.000000000 +0000
 +++ build/premake/extern_libs5.lua
-@@ -347,7 +347,7 @@ extern_lib_defs = {
- 			elseif os.is("macosx") then
+@@ -350,7 +350,7 @@ extern_lib_defs = {
+ 			elseif os.istarget("macosx") then
  				add_default_include_paths("iconv")
  				defines { "LIBICONV_STATIC" }
 -			elseif os.getversion().description == "FreeBSD" then
 +			elseif os.getversion().description == "NetBSD" then
- 				defines { "HAVE_ICONV_CONST" }
- 				defines { "ICONV_CONST=const" }
+ 				-- On FreeBSD you need this flag to tell it to use the BSD libc iconv
+ 				defines { "LIBICONV_PLUG" }
  			end
diff --git a/0ad/patches/patch-source_scriptinterface_ScriptTypes.h b/0ad/patches/patch-source_scriptinterface_ScriptTypes.h
new file mode 100644
index 0000000000..5ab8593741
--- /dev/null
+++ b/0ad/patches/patch-source_scriptinterface_ScriptTypes.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- source/scriptinterface/ScriptTypes.h.orig	2021-07-27 21:56:58.000000000 +0000
++++ source/scriptinterface/ScriptTypes.h
+@@ -81,6 +81,7 @@ system-installed version. Make sure you 
+ include paths.
+ #endif
+ 
++#if 0
+ #if MOZJS_MINOR_VERSION != 6
+ #error Your compiler is trying to use an untested minor version of the \
+ SpiderMonkey library. If you are a package maintainer, please make sure \
+@@ -93,6 +94,7 @@ version. Another way for testing is runn
+ final hash (check trac.wildfiregames.com/wiki/Debugging#Replaymode). \
+ For more information check this link: trac.wildfiregames.com/wiki/Debugging#Outofsync
+ #endif
++#endif
+ 
+ class ScriptInterface;
+