widelands: Attempt with different gettext patch

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

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Aug 25 18:43:09 2021 +0200
Changeset:	4f07b1a923101614a8a5c6c438ea29b95d8321a5

Modified Files:
	widelands/Makefile
	widelands/TODO
	widelands/distinfo
	widelands/patches/patch-src_scripting_lua__globals.cc

Log Message:
widelands: Attempt with different gettext patch

Still does not work with locale "en_US.UTF-8" on NetBSD.

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

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

diffstat:
 widelands/Makefile                                    | 4 ++--
 widelands/TODO                                        | 1 +
 widelands/distinfo                                    | 2 +-
 widelands/patches/patch-src_scripting_lua__globals.cc | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diffs:
diff --git a/widelands/Makefile b/widelands/Makefile
index 855414e258..9ee1b187c4 100644
--- a/widelands/Makefile
+++ b/widelands/Makefile
@@ -17,8 +17,8 @@ USE_LANGUAGES=	c c++11
 # C++11
 GCC_REQD+=	4.8
 
-# Will otherwise hit the limit for open files
-MAKE_JOBS_SAFE=	NO
+# Disable if build hits the limit for open files
+MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	..
diff --git a/widelands/TODO b/widelands/TODO
index d2def41385..b5dea96637 100644
--- a/widelands/TODO
+++ b/widelands/TODO
@@ -3,3 +3,4 @@
 [X] Update PLIST
 [ ] FATAL EXCEPTION while loading game data
     https://github.com/widelands/widelands/issues/5008
+    Works with locale "de_DE.UTF-8", but not with "en_US.UTF-8" on NetBSD 9.
diff --git a/widelands/distinfo b/widelands/distinfo
index 12dcf993b7..3d40ece8bc 100644
--- a/widelands/distinfo
+++ b/widelands/distinfo
@@ -8,5 +8,5 @@ SHA1 (patch-CMakeLists.txt) = 9393491b8b9829c06dfbd6d6089e2acd0e97e328
 SHA1 (patch-src_CMakeLists.txt) = dafa0f7e77fc61bc6ac6c9608acfd27629a13f31
 SHA1 (patch-src_base_i18n.cc) = fb0bdc35166b3dac0ee906a4a8f155c190a488df
 SHA1 (patch-src_network_bufferedconnection.h) = c3b8ced8d90a70da88dcb61ed079bf95ac350a23
-SHA1 (patch-src_scripting_lua__globals.cc) = a6e93c2da3449c01a135f062d17c3abdae56a242
+SHA1 (patch-src_scripting_lua__globals.cc) = f26d5a1949078b218e1de8cd0112a98996f63e53
 SHA1 (patch-xdg_CMakeLists.txt) = 4fac4da5c8d7d1f528caec5de21a212c03f44932
diff --git a/widelands/patches/patch-src_scripting_lua__globals.cc b/widelands/patches/patch-src_scripting_lua__globals.cc
index 03e359584d..152b6b7f58 100644
--- a/widelands/patches/patch-src_scripting_lua__globals.cc
+++ b/widelands/patches/patch-src_scripting_lua__globals.cc
@@ -12,8 +12,8 @@ The header "include/libintl.h" provides a macro that does not work.
 +
 +// pkgsrc patch for NetBSD
 +#ifdef __NetBSD__
-+#define dnpgettext_expr(domainname, msgctxt, msgid, msgidPlural, n) \
-+    dcnpgettext_expr((domainname), (msgctxt), (msgid), (msgidPlural), (n), (LC_MESSAGES))
++#define dnpgettext_expr \
++    dnpgettext
 +#endif
 +
 +