CVS commit: pkgsrc/games/wesnoth

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 30 09:14:24 UTC 2025

Modified Files:
        pkgsrc/games/wesnoth: distinfo
        pkgsrc/games/wesnoth/patches: patch-CMakeLists.txt
            patch-src_CMakeLists.txt

Log Message:
wesnoth: fix build with Boost-1.89.0


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/games/wesnoth/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt

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/distinfo
diff -u pkgsrc/games/wesnoth/distinfo:1.95 pkgsrc/games/wesnoth/distinfo:1.96
--- pkgsrc/games/wesnoth/distinfo:1.95  Tue Jun 10 15:00:10 2025
+++ pkgsrc/games/wesnoth/distinfo       Tue Sep 30 09:14:24 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.95 2025/06/10 15:00:10 adam Exp $
+$NetBSD: distinfo,v 1.96 2025/09/30 09:14:24 adam Exp $
 
 BLAKE2s (wesnoth-1.18.5.tar.bz2) = 38aef599b901aa34fdf3f7677494a6dc287f041af32e0c4c4b97edb67fe15a27
 SHA512 (wesnoth-1.18.5.tar.bz2) = 43137cd90f0d64eab579d58aadbf3cff045ead5709040e84b8299e33d2515182b0c5c0747cc06f9d9a4155e160dbee59963a1165392dde0c3cdb85c9c70ebc0b
 Size (wesnoth-1.18.5.tar.bz2) = 461916727 bytes
-SHA1 (patch-CMakeLists.txt) = e1c4f9bb90529e0a1025c3ce6751b50ddb8171fd
-SHA1 (patch-src_CMakeLists.txt) = 7917bd0a3aedf3523a73e4542cbdf54c08a78f77
+SHA1 (patch-CMakeLists.txt) = 5b12e3ad5574ce6d2f903e650e119e934f3a5e14
+SHA1 (patch-src_CMakeLists.txt) = a0117655338434bef9e92d211d117a111bac2aac
 SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67

Index: pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt
diff -u pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt:1.7 pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt:1.8
--- pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt:1.7       Sun Apr  7 21:39:03 2024
+++ pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt   Tue Sep 30 09:14:24 2025
@@ -1,12 +1,21 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2024/04/07 21:39:03 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.8 2025/09/30 09:14:24 adam Exp $
 
+Don't use boost_system library.
 Do not look for X11 on macOS.
 We don't have readline as a module.
 Do not bother with uninstaller.
 
---- CMakeLists.txt.orig        2024-03-18 00:11:38.000000000 +0000
+--- CMakeLists.txt.orig        2025-05-20 22:28:48.000000000 +0000
 +++ CMakeLists.txt
-@@ -100,7 +100,9 @@ find_package(ICU REQUIRED COMPONENTS dat
+@@ -93,14 +93,16 @@ if(APPLE)
+       find_library(SECURITY_LIBRARY Security REQUIRED)
+ endif()
+ 
+-find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph)
++find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex thread random coroutine locale filesystem graph)
+ find_package(ICU REQUIRED COMPONENTS data i18n uc)
+ 
+ # no, gettext executables are not required when NLS is deactivated
  find_package(Gettext)
  find_package(Python)
  

Index: pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt:1.5 pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt:1.6
--- pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt:1.5   Sun Apr  7 21:39:03 2024
+++ pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt       Tue Sep 30 09:14:24 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.5 2024/04/07 21:39:03 adam Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.6 2025/09/30 09:14:24 adam Exp $
 
+Don't link against Boost::system.
 On macOS, do not build SDLMain.mm; only needed for app bundle.
 
---- src/CMakeLists.txt.orig    2024-03-18 00:11:38.000000000 +0000
+--- src/CMakeLists.txt.orig    2025-05-20 22:28:48.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -239,8 +239,6 @@ if(ENABLE_GAME)
+@@ -231,8 +231,6 @@ if(ENABLE_GAME)
                if(MSVC)
                        target_link_options(wesnoth PRIVATE /WX /WHOLEARCHIVE:wesnoth-widgets)
                endif()
@@ -13,3 +14,35 @@ On macOS, do not build SDLMain.mm; only 
        else()
                add_executable(wesnoth wesnoth.cpp)
        endif()
+@@ -248,7 +246,6 @@ if(ENABLE_GAME)
+               Boost::iostreams
+               Boost::program_options
+               Boost::regex
+-              Boost::system
+               Boost::random
+               Boost::coroutine
+               Boost::locale
+@@ -295,7 +292,6 @@ if(ENABLE_TESTS)
+               Boost::iostreams
+               Boost::program_options
+               Boost::regex
+-              Boost::system
+               Boost::random
+               Boost::coroutine
+               Boost::locale
+@@ -344,7 +340,6 @@ if(ENABLE_SERVER)
+               Boost::iostreams
+               Boost::program_options
+               Boost::regex
+-              Boost::system
+               Boost::random
+               Boost::coroutine
+               Boost::locale
+@@ -385,7 +380,6 @@ if(ENABLE_CAMPAIGN_SERVER)
+               Boost::iostreams
+               Boost::program_options
+               Boost::regex
+-              Boost::system
+               Boost::random
+               Boost::coroutine
+               Boost::locale