widelands: Note upstream pull requests.

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sat Aug 10 10:02:06 2024 +1000
Changeset:	87f6059c75cff20a34ba2701408c61f9dc231af3

Modified Files:
	widelands/distinfo
	widelands/patches/patch-CMakeLists.txt
	widelands/patches/patch-src_CMakeLists.txt
	widelands/patches/patch-src_base_i18n.cc
	widelands/patches/patch-src_base_i18n.h
	widelands/patches/patch-src_graphic_text_textstream.cc

Log Message:
widelands: Note upstream pull requests.

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

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

diffstat:
 widelands/distinfo                                     | 10 +++++-----
 widelands/patches/patch-CMakeLists.txt                 |  2 ++
 widelands/patches/patch-src_CMakeLists.txt             |  2 ++
 widelands/patches/patch-src_base_i18n.cc               |  2 ++
 widelands/patches/patch-src_base_i18n.h                |  2 ++
 widelands/patches/patch-src_graphic_text_textstream.cc |  2 ++
 6 files changed, 15 insertions(+), 5 deletions(-)

diffs:
diff --git a/widelands/distinfo b/widelands/distinfo
index 082a694231..8ff9400935 100644
--- a/widelands/distinfo
+++ b/widelands/distinfo
@@ -3,9 +3,9 @@ $NetBSD: distinfo,v 1.8 2021/10/26 10:44:30 nia Exp $
 BLAKE2s (widelands/v1.2.tar.gz) = ff2be3b1449b2ec987938fd039584861295334cafe3f59312164a886908c4c45
 SHA512 (widelands/v1.2.tar.gz) = 4e0c7c02c4bdb2806d67a07425d7a17b2867416c994e18f8511b45087e80645a3e602ee168f3f8640434b47eff25d9758f12d2a677b454d95855d8173e9dc8c8
 Size (widelands/v1.2.tar.gz) = 457973371 bytes
-SHA1 (patch-CMakeLists.txt) = e13b1a8f45d4a3c650476ab4cd0ab45c6101394d
-SHA1 (patch-src_CMakeLists.txt) = f833ae4b06e81cc7a147e1e5a03c02fad92370c1
-SHA1 (patch-src_base_i18n.cc) = 785cdfaca59f929de14dde96386f9e9cfca27e21
-SHA1 (patch-src_base_i18n.h) = 687296e3e654e3ed09e648a83571e282ed251bfb
-SHA1 (patch-src_graphic_text_textstream.cc) = d1a06e003bbd8e7d8f843d4877fe81d724d4a481
+SHA1 (patch-CMakeLists.txt) = bfa81b8d23ad60aa660ff5c8e7769e93f47e04a5
+SHA1 (patch-src_CMakeLists.txt) = 4dadeb1dea4363c0d850912c73d7e4e33728daeb
+SHA1 (patch-src_base_i18n.cc) = b8b56f6ab1256c7a35640189785b1972ea1cc3ea
+SHA1 (patch-src_base_i18n.h) = 5b7f6070e014e83d5f0a735105361809ea2b117f
+SHA1 (patch-src_graphic_text_textstream.cc) = 7994c8d7f1aeaa52fb1591aeb5eb7ee8f7ed16a1
 SHA1 (patch-xdg_CMakeLists.txt) = ce08eacbfbf9d32b6c72e411538adb0472d58851
diff --git a/widelands/patches/patch-CMakeLists.txt b/widelands/patches/patch-CMakeLists.txt
index ec2d9b7148..ca4c655e63 100644
--- a/widelands/patches/patch-CMakeLists.txt
+++ b/widelands/patches/patch-CMakeLists.txt
@@ -2,6 +2,8 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2019/09/03 20:27:02 adam Exp $
 
 Support NetBSD.
 
+https://github.com/widelands/widelands/issues/6488
+
 --- CMakeLists.txt.orig	2024-03-28 10:12:05.000000000 +0000
 +++ CMakeLists.txt
 @@ -146,6 +146,7 @@ add_definitions(-DASIO_STANDALONE)
diff --git a/widelands/patches/patch-src_CMakeLists.txt b/widelands/patches/patch-src_CMakeLists.txt
index f1351a8e99..9b18571679 100644
--- a/widelands/patches/patch-src_CMakeLists.txt
+++ b/widelands/patches/patch-src_CMakeLists.txt
@@ -2,6 +2,8 @@ $NetBSD: patch-src_CMakeLists.txt,v 1.2 2020/07/27 15:21:43 nia Exp $
 
 Support NetBSD.
 
+https://github.com/widelands/widelands/issues/6488
+
 --- src/CMakeLists.txt.orig	2024-03-28 10:12:05.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -165,9 +165,13 @@ wl_library(widelands_options
diff --git a/widelands/patches/patch-src_base_i18n.cc b/widelands/patches/patch-src_base_i18n.cc
index 023fc7f298..380257963a 100644
--- a/widelands/patches/patch-src_base_i18n.cc
+++ b/widelands/patches/patch-src_base_i18n.cc
@@ -4,6 +4,8 @@ Include clocale unconditionally.
 
 Undefine any *gettext macros to avoid infinite recursion.
 
+https://github.com/widelands/widelands/issues/6488
+
 --- src/base/i18n.cc.orig	2024-03-28 10:12:05.000000000 +0000
 +++ src/base/i18n.cc
 @@ -20,9 +20,7 @@
diff --git a/widelands/patches/patch-src_base_i18n.h b/widelands/patches/patch-src_base_i18n.h
index fe0815a6c1..bc287bc983 100644
--- a/widelands/patches/patch-src_base_i18n.h
+++ b/widelands/patches/patch-src_base_i18n.h
@@ -2,6 +2,8 @@ $NetBSD$
 
 Define gettext_noop if missing.
 
+Fixed in upstream head with migration to tinygettext.
+
 --- src/base/i18n.h.orig	2024-03-28 10:12:05.000000000 +0000
 +++ src/base/i18n.h
 @@ -52,6 +52,10 @@
diff --git a/widelands/patches/patch-src_graphic_text_textstream.cc b/widelands/patches/patch-src_graphic_text_textstream.cc
index 77d7e36a2e..70f6c10b93 100644
--- a/widelands/patches/patch-src_graphic_text_textstream.cc
+++ b/widelands/patches/patch-src_graphic_text_textstream.cc
@@ -3,6 +3,8 @@ $NetBSD$
 Cast argument to isspace to unsigned char, as required by POSIX, else this
 breaks with UTF-8 chars on NetBSD.
 
+https://github.com/widelands/widelands/issues/6488
+
 --- src/graphic/text/textstream.cc.orig	2024-03-28 10:12:05.000000000 +0000
 +++ src/graphic/text/textstream.cc
 @@ -49,12 +49,12 @@ void TextStream::consume(size_t cnt) {