widelands: Update widelands to 1.2.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: widelands: Update widelands to 1.2.1
From: Paul Ripke (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 18 Nov 2024 07:39:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Mon Nov 18 18:37:12 2024 +1100
Changeset:	6b54c0bf41f2a2a101bd26a3439d62e6cd1c5240

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

Log Message:
widelands: Update widelands to 1.2.1

Highlights in the Widelands 1.2.1 release:

- This point release fixes several bugs and crashes found in Widelands 1.2, and
  offers full compatibility between these two releases for multiplayer games and replays.

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

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

diffstat:
 widelands/COMMIT_MSG                               |  7 +++-
 widelands/Makefile                                 |  5 +--
 widelands/distinfo                                 | 11 +++----
 widelands/patches/patch-CMakeLists.txt             | 38 ----------------------
 widelands/patches/patch-src_CMakeLists.txt         | 24 --------------
 widelands/patches/patch-src_base_i18n.cc           | 14 ++------
 .../patches/patch-src_graphic_text_textstream.cc   | 24 --------------
 7 files changed, 15 insertions(+), 108 deletions(-)

diffs:
diff --git a/widelands/COMMIT_MSG b/widelands/COMMIT_MSG
index b20ca6158e..6d0439c9a3 100644
--- a/widelands/COMMIT_MSG
+++ b/widelands/COMMIT_MSG
@@ -1,4 +1,9 @@
-games/widelands: Update widelands to 1.2
+games/widelands: Update widelands to 1.2.1
+
+Highlights in the Widelands 1.2.1 release:
+
+- This point release fixes several bugs and crashes found in Widelands 1.2, and
+  offers full compatibility between these two releases for multiplayer games and replays.
 
 Highlights in the Widelands 1.2 release:
 
diff --git a/widelands/Makefile b/widelands/Makefile
index b5ce264dff..6e782549ca 100644
--- a/widelands/Makefile
+++ b/widelands/Makefile
@@ -1,7 +1,8 @@
 # $NetBSD: Makefile,v 1.36 2023/11/12 13:21:45 wiz Exp $
 
-PKGNAME=	widelands-1.2
-DISTNAME=	v${PKGVERSION_NOREV}
+PKGVERSION=	1.2.1
+PKGNAME=	widelands-${PKGVERSION}
+DISTNAME=	v${PKGVERSION:C/rc/-rc/}
 CATEGORIES=	games
 MASTER_SITES=	https://codeberg.org/wl/widelands/archive/
 
diff --git a/widelands/distinfo b/widelands/distinfo
index 8ff9400935..98e91806db 100644
--- a/widelands/distinfo
+++ b/widelands/distinfo
@@ -1,11 +1,8 @@
 $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) = bfa81b8d23ad60aa660ff5c8e7769e93f47e04a5
-SHA1 (patch-src_CMakeLists.txt) = 4dadeb1dea4363c0d850912c73d7e4e33728daeb
-SHA1 (patch-src_base_i18n.cc) = b8b56f6ab1256c7a35640189785b1972ea1cc3ea
+BLAKE2s (widelands/v1.2.1.tar.gz) = d3fe7d500d3d997fb0a69320452b55cd8fc1daf957573499b38f4d87d760f977
+SHA512 (widelands/v1.2.1.tar.gz) = eb765367e57bab7d016a0e9ad0f5f2e17e31124cb94a149c87a17ce22169509361f408297233e14001e12a8546cfbea879a21a05e47b7f48ba6924ce1a8080e9
+Size (widelands/v1.2.1.tar.gz) = 458108419 bytes
+SHA1 (patch-src_base_i18n.cc) = 686b13db53cb16cf72f210204c7e622b8b298c6a
 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
deleted file mode 100644
index ca4c655e63..0000000000
--- a/widelands/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-$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)
- 
- if (APPLE OR WIN32 OR
-     CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
-+    CMAKE_SYSTEM_NAME MATCHES "NetBSD" OR
-     CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-   if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-     find_package(Intl REQUIRED)
-@@ -442,7 +443,9 @@ if(NOT OPTION_ASAN)
- endif()
- 
- # on BSD this must be explicitly linked
--if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
-+    CMAKE_SYSTEM_NAME MATCHES "NetBSD" OR
-+    CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-   # Not needed on Debian GNU/kFreeBSD..
-   if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-     find_library(EXECINFO_LIBRARY NAMES execinfo)
-@@ -453,7 +456,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" 
-     find_package(X11 REQUIRED)
-     include_directories(${X11_INCLUDE_DIR})
-   endif ()
--endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
-+       CMAKE_SYSTEM_NAME MATCHES "NetBSD" OR
-+       CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
- 
- if (NOT DEFINED WL_VERSION)
-   include (${CMAKE_SOURCE_DIR}/cmake/BzrRevision.cmake)
diff --git a/widelands/patches/patch-src_CMakeLists.txt b/widelands/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index 9b18571679..0000000000
--- a/widelands/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
-   USES_SDL2
- )
- 
--if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
-+    CMAKE_SYSTEM_NAME MATCHES "NetBSD" OR
-+    CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-   target_link_libraries(widelands_ball_of_mud ${EXECINFO_LIBRARY})
--endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
-+       CMAKE_SYSTEM_NAME MATCHES "NetBSD" OR
-+       CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
- 
- if (WIN32)
-   target_link_libraries(widelands_ball_of_mud wsock32)
diff --git a/widelands/patches/patch-src_base_i18n.cc b/widelands/patches/patch-src_base_i18n.cc
index 380257963a..6d86d067e1 100644
--- a/widelands/patches/patch-src_base_i18n.cc
+++ b/widelands/patches/patch-src_base_i18n.cc
@@ -6,19 +6,9 @@ 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.orig	2024-10-30 12:47:18.000000000 +0000
 +++ src/base/i18n.cc
-@@ -20,9 +20,7 @@
- 
- #include "base/i18n.h"
- 
--#ifdef __FreeBSD__
- #include <clocale>
--#endif
- 
- #include <cstdlib>
- #include <map>
-@@ -46,6 +44,12 @@
+@@ -46,6 +46,12 @@
  #endif
  #endif
  
diff --git a/widelands/patches/patch-src_graphic_text_textstream.cc b/widelands/patches/patch-src_graphic_text_textstream.cc
deleted file mode 100644
index 70f6c10b93..0000000000
--- a/widelands/patches/patch-src_graphic_text_textstream.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$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) {
-  * r* means skip_ws starting from the back of the string
-  */
- void TextStream::skip_ws() {
--	while (pos_ < end_ && (isspace(text_[pos_]) != 0)) {
-+	while (pos_ < end_ && (isspace(static_cast<unsigned char>(text_[pos_])) != 0)) {
- 		consume(1);
- 	}
- }
- void TextStream::rskip_ws() {
--	while (pos_ < end_ && (isspace(text_[end_ - 1]) != 0)) {
-+	while (pos_ < end_ && (isspace(static_cast<unsigned char>(text_[end_ - 1])) != 0)) {
- 		--end_;
- 	}
- }
Prev by Date: py-Tooling: created as a tool dependency for dev version of ghdl
Next by Date: perl5-devel: remove, older than lang/perl5
Previous by Thread: py-Tooling: created as a tool dependency for dev version of ghdl
Next by Thread: perl5-devel: remove, older than lang/perl5
Indexes:
Home | Main Index | Thread Index | Old Index