CVS commit: pkgsrc/games/wesnoth

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 23 08:01:06 UTC 2023

Modified Files:
        pkgsrc/games/wesnoth: Makefile distinfo
        pkgsrc/games/wesnoth/patches: patch-src_color__range.cpp
Added Files:
        pkgsrc/games/wesnoth/patches: patch-src_gettext.cpp

Log Message:
wesnoth: updated to 1.16.10

Version 1.16.10
 Campaigns
   * Heir to the Throne
     * S03: Rewrite intro text, including a hint about training troops
 Editor
   * Scrolling the map north or south can move the text that overlays the map, so it doesn't always obscure the southmost hexes of the map.
 Multiplayer
   * Allied units’ orbs no longer look like the player’s own units’ orbs.
       * By default, they are now two-color during the ally’s turn.
       * Added an advanced setting to always show them as single-color (the ally color).
   * "Back to Turn" menu no longer crashes the game when used
     After the game has ended.
   * World Conquest: Fixed rare lua error when a unit is killed.
   * World Conquest: Fixed Bezoar Item.
   * World Conquest: Fixed some items losing their effects in
     later scenarios.
   * World Conquest: Fixed units losing hp wheh picking up an
     artifact
   * World Conquest: Fixed "Promote to commander"
 Translations
   * Updated translations: Arabic, Czech, French, Italian, Spanish, Portuguese (Brazil)
 User interface
   * Fix file dialogs (e.g. Save As dialog in the Map Editor) not listing /run/media/USER
     as a possible file location on modern Linux distributions.
   * Update the preferences window’s Display resolution list if the game window is resized.
   * Improved the layout of the orb colors dialog, and added tooltips.
 Miscellaneous and Bug Fixes
   * Fixed Possible Crash when using planning mode
   * Fixed Possible OOS when using planning mode
   * Fixed game hanging when an enemy attacks a unit
     with planned moves
   * Fixed custom effects implemented via wesnoth.effects
     losing their effects in later scenarios.
   * Fix Crash undo+redo error after reloading
   * Fix Crash when loading old replays
   * Fix Crash when a unit has bad animations replays
   * Postponed the removal of the `SPECIAL_NOTES` macro, which means there will be fewer log messages.


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 pkgsrc/games/wesnoth/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/games/wesnoth/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/wesnoth/patches/patch-src_color__range.cpp
cvs rdiff -u -r0 -r1.1 pkgsrc/games/wesnoth/patches/patch-src_gettext.cpp

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

Modified files:

Index: pkgsrc/games/wesnoth/Makefile
diff -u pkgsrc/games/wesnoth/Makefile:1.201 pkgsrc/games/wesnoth/Makefile:1.202
--- pkgsrc/games/wesnoth/Makefile:1.201 Mon Aug 14 05:24:28 2023
+++ pkgsrc/games/wesnoth/Makefile       Wed Aug 23 08:01:06 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.201 2023/08/14 05:24:28 wiz Exp $
+# $NetBSD: Makefile,v 1.202 2023/08/23 08:01:06 adam Exp $
 
-DISTNAME=      wesnoth-1.16.9
-PKGREVISION=   2
+DISTNAME=      wesnoth-1.16.10
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=  .tar.bz2
@@ -13,9 +12,7 @@ LICENSE=      gnu-gpl-v2
 
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 
-USE_CMAKE=             yes
-# XXX check this, uses c++17 features
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            bash msgfmt perl:run pkg-config
 # detects history.h, but does not link against libhistory
@@ -69,6 +66,7 @@ LDFLAGS.SunOS+=               -lsocket
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=  pango>=1.14.8
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/games/wesnoth/distinfo
diff -u pkgsrc/games/wesnoth/distinfo:1.85 pkgsrc/games/wesnoth/distinfo:1.86
--- pkgsrc/games/wesnoth/distinfo:1.85  Mon Apr 24 15:24:00 2023
+++ pkgsrc/games/wesnoth/distinfo       Wed Aug 23 08:01:06 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.85 2023/04/24 15:24:00 adam Exp $
+$NetBSD: distinfo,v 1.86 2023/08/23 08:01:06 adam Exp $
 
-BLAKE2s (wesnoth-1.16.9.tar.bz2) = 46f73a54fd8f2bcccd2cbe38d4d3aca6946ae4f6ecd5255336162c2595b53725
-SHA512 (wesnoth-1.16.9.tar.bz2) = 6dac161d7215c9d1ab26da2b6573234d9bf71f4d9bd22f11613328af76d319daad3445a36d0e525be547494d98296d5dca6e0cb603f1a64ba7ea6b7590f5a6f2
-Size (wesnoth-1.16.9.tar.bz2) = 476167874 bytes
+BLAKE2s (wesnoth-1.16.10.tar.bz2) = 42fa0b55eaed95ac4606768da2c95cf6491f47bcd66cfd962e7cfbe62c91cea4
+SHA512 (wesnoth-1.16.10.tar.bz2) = 1ea0a4c9b0f9b8be39ebb7c56546b6bfb2e8f47dedd9725f2aff2ce5c4d6ed1d4b03c9b5ead3881a0e8bcd5be3ea7d181e93721fbbba95a8ed4834992981a819
+Size (wesnoth-1.16.10.tar.bz2) = 476195873 bytes
 SHA1 (patch-CMakeLists.txt) = 2670d4a527019706d8614c7e715e25c39f044d0e
 SHA1 (patch-src_CMakeLists.txt) = 776c522ccfc544d8898d786fe164c2be1812db1a
-SHA1 (patch-src_color__range.cpp) = bdce94054a0fb2972e63a968fdb78e34db1213a6
+SHA1 (patch-src_color__range.cpp) = f4c331fdc804ae9001beb8cdb9b95059821f305d
+SHA1 (patch-src_gettext.cpp) = 3ecb6bd1e45c2b771627a2ce66f1b438527dbed9
 SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67

Index: pkgsrc/games/wesnoth/patches/patch-src_color__range.cpp
diff -u pkgsrc/games/wesnoth/patches/patch-src_color__range.cpp:1.1 pkgsrc/games/wesnoth/patches/patch-src_color__range.cpp:1.2
--- pkgsrc/games/wesnoth/patches/patch-src_color__range.cpp:1.1 Wed Apr 15 22:52:09 2020
+++ pkgsrc/games/wesnoth/patches/patch-src_color__range.cpp     Wed Aug 23 08:01:06 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_color__range.cpp,v 1.1 2020/04/15 22:52:09 joerg Exp $
+$NetBSD: patch-src_color__range.cpp,v 1.2 2023/08/23 08:01:06 adam Exp $
+
+Add missing include.
 
 --- src/color_range.cpp.orig   2020-04-14 20:36:13.908481410 +0000
 +++ src/color_range.cpp

Added files:

Index: pkgsrc/games/wesnoth/patches/patch-src_gettext.cpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_gettext.cpp:1.1
--- /dev/null   Wed Aug 23 08:01:06 2023
+++ pkgsrc/games/wesnoth/patches/patch-src_gettext.cpp  Wed Aug 23 08:01:06 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_gettext.cpp,v 1.1 2023/08/23 08:01:06 adam Exp $
+
+Fix for Boost 1.83.0.
+https://github.com/wesnoth/wesnoth/issues/7849
+
+--- src/gettext.cpp.orig       2023-08-23 05:46:06.000000000 +0000
++++ src/gettext.cpp
+@@ -169,7 +169,11 @@ namespace
+                       return msg;
+               }
+ 
++#if BOOST_VERSION < 108300
+               const char* get(int domain_id, const char* ctx, const char* sid, int n) const override
++#else
++              const char* get(int domain_id, const char* ctx, const char* sid, bl::count_type n) const override
++#endif
+               {
+                       auto& base = get_base();
+                       const char* msg = base.get(domain_id, ctx, sid, n);