Date: Tue, 10 Mar 2026 18:35:31 +0000 From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 31d509bd771a - main - games/widelands: update 1=?utf-8?Q?=2E2.1 =E2=86=92?= 1.3.1 Message-ID: <69b06473.2030a.50e8922c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=31d509bd771accf876f5053c87b2c158cc1a87aa commit 31d509bd771accf876f5053c87b2c158cc1a87aa Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2026-03-10 15:48:11 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2026-03-10 18:34:30 +0000 games/widelands: update 1.2.1 → 1.3.1 PR: 293644 Tested by: thindil@laeran.pl.eu.org --- games/widelands/Makefile | 8 +- games/widelands/distinfo | 6 +- .../patch-c0b44ccc04df35a9a23ca9be3e05f5d3a5428f6f | 224 --------------------- games/widelands/pkg-plist | 2 +- 4 files changed, 7 insertions(+), 233 deletions(-) diff --git a/games/widelands/Makefile b/games/widelands/Makefile index 341d3da609cd..283d3ee63665 100644 --- a/games/widelands/Makefile +++ b/games/widelands/Makefile @@ -1,6 +1,6 @@ PORTNAME= widelands DISTVERSIONPREFIX= v -DISTVERSION= 1.2.1 +DISTVERSION= 1.3.1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -12,11 +12,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libicuuc.so:devel/icu \ - libboost_thread.so:devel/boost-libs \ libminizip.so:archivers/minizip BUILD_DEPENDS= ${PREFIX}/include/asio.hpp:net/asio -USES= cmake compiler:c++11-lib cpe gettext gl pkgconfig \ +USES= cmake compiler:c++11-lib cpe gl pkgconfig \ python:build sdl USE_GITHUB= yes USE_GL= gl glew @@ -35,12 +34,11 @@ PORTSCOUT= limit:^[0-9]+\. PORTDATA= * PORTDOCS= * -OPTIONS_DEFINE= DOCS LTO NLS TEST +OPTIONS_DEFINE= DOCS LTO TEST OPTIONS_DEFAULT=LTO OPTIONS_EXCLUDE_riscv64= LTO LTO_CMAKE_ON= -DUSE_FLTO_IF_AVAILABLE:STRING="yes" -NLS_CMAKE_BOOL= OPTION_BUILD_TRANSLATIONS TEST_CMAKE_BOOL=OPTION_BUILD_TESTS post-extract: diff --git a/games/widelands/distinfo b/games/widelands/distinfo index 2250b591ca41..098ca87b9866 100644 --- a/games/widelands/distinfo +++ b/games/widelands/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1736974158 -SHA256 (widelands-widelands-v1.2.1_GH0.tar.gz) = 799bfd32048ef20118c48e21f3fc843ae0451c42bb8bf2eabcb9b26bf6fe54b4 -SIZE (widelands-widelands-v1.2.1_GH0.tar.gz) = 457853247 +TIMESTAMP = 1773147613 +SHA256 (widelands-widelands-v1.3.1_GH0.tar.gz) = e6f3e8f4fcafd367962dbacde80e26fc63afad38cfe26fadba9c92d4a01bd687 +SIZE (widelands-widelands-v1.3.1_GH0.tar.gz) = 468150797 diff --git a/games/widelands/files/patch-c0b44ccc04df35a9a23ca9be3e05f5d3a5428f6f b/games/widelands/files/patch-c0b44ccc04df35a9a23ca9be3e05f5d3a5428f6f deleted file mode 100644 index 8465cd586a40..000000000000 --- a/games/widelands/files/patch-c0b44ccc04df35a9a23ca9be3e05f5d3a5428f6f +++ /dev/null @@ -1,224 +0,0 @@ -From c0b44ccc04df35a9a23ca9be3e05f5d3a5428f6f Mon Sep 17 00:00:00 2001 -From: matthiakl <t-m.42@mailpost.spdns.org> -Date: Sun, 23 Mar 2025 09:17:47 +0000 -Subject: [PATCH] Update asio interfaces (GH #6665 / CB #5025) - -Co-authored-by: matthiakl <t-m.42@mailpost.spdns.org> -Co-authored-by: Widelands Bunnybot <bunnybot@widelands.org> -Co-authored-by: matthiakl <t-m.42@mailpost.spdns.org> -Co-committed-by: matthiakl <t-m.42@mailpost.spdns.org> ---- - src/network/bufferedconnection.cc | 16 ++++++++-------- - src/network/bufferedconnection.h | 4 ++-- - src/network/nethost.cc | 12 ++++++------ - src/network/nethost.h | 4 ++-- - src/network/network.cc | 14 +++++++------- - src/network/network_lan_promotion.cc | 4 ++-- - src/network/network_lan_promotion.h | 2 +- - 7 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/src/network/bufferedconnection.cc b/src/network/bufferedconnection.cc -index 715c2baf5c2..389360526c3 100644 ---- src/network/bufferedconnection.cc -+++ src/network/bufferedconnection.cc -@@ -141,12 +141,12 @@ void BufferedConnection::close() { - verb_log_info("[BufferedConnection] Closing network socket."); - } - // Stop the thread -- io_service_.stop(); -- // Not sure if that is required, wait up to one second for the io_service to stop -- for (int i = 0; i < 1000 && !io_service_.stopped(); i++) { -+ io_context_.stop(); -+ // Not sure if that is required, wait up to one second for the io_context to stop -+ for (int i = 0; i < 1000 && !io_context_.stopped(); i++) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - } -- assert(io_service_.stopped()); -+ assert(io_context_.stopped()); - if (asio_thread_.joinable()) { - try { - asio_thread_.join(); -@@ -334,7 +334,7 @@ void BufferedConnection::reduce_send_buffer(asio::ip::tcp::socket& socket) { - } - - BufferedConnection::BufferedConnection(const NetAddress& host) -- : socket_(io_service_), currently_sending_(false) { -+ : socket_(io_context_), currently_sending_(false) { - - const asio::ip::tcp::endpoint destination(host.ip, host.port); - -@@ -353,7 +353,7 @@ BufferedConnection::BufferedConnection(const NetAddress& host) - asio_thread_ = std::thread([this]() { - // The output might actually be messed up if it collides with the main thread... - verb_log_info("[BufferedConnection] Starting networking thread\n"); -- io_service_.run(); -+ io_context_.run(); - verb_log_info("[BufferedConnection] Stopping networking thread\n"); - }); - } else { -@@ -364,7 +364,7 @@ BufferedConnection::BufferedConnection(const NetAddress& host) - } - } - --BufferedConnection::BufferedConnection() : socket_(io_service_) { -+BufferedConnection::BufferedConnection() : socket_(io_context_) { - } - - void BufferedConnection::notify_connected() { -@@ -379,7 +379,7 @@ void BufferedConnection::notify_connected() { - asio_thread_ = std::thread([this]() { - // The output might actually be messed up if it collides with the main thread... - verb_log_info("[BufferedConnection] Starting networking thread"); -- io_service_.run(); -+ io_context_.run(); - verb_log_info("[BufferedConnection] Stopping networking thread"); - }); - } -diff --git a/src/network/bufferedconnection.h b/src/network/bufferedconnection.h -index 71f9bdfd6a0..c47b994500b 100644 ---- src/network/bufferedconnection.h -+++ src/network/bufferedconnection.h -@@ -314,8 +314,8 @@ class BufferedConnection { - /// Each packet in the queue is a vector of uint8_t. - std::map<uint8_t, std::queue<std::vector<uint8_t>>> buffers_to_send_; - -- /// An io_service needed by asio. Primarily needed for asynchronous operations. -- asio::io_service io_service_; -+ /// An io_context needed by asio. Primarily needed for asynchronous operations. -+ asio::io_context io_context_; - - /// The socket that connects us to the host. - asio::ip::tcp::socket socket_; -diff --git a/src/network/nethost.cc b/src/network/nethost.cc -index 16b08454929..25e369ef3c1 100644 ---- src/network/nethost.cc -+++ src/network/nethost.cc -@@ -67,11 +67,11 @@ bool NetHost::is_connected(const ConnectionId id) const { - void NetHost::stop_listening() { - - // Stop the thread -- io_service_.stop(); -- for (int i = 0; i < 1000 && !io_service_.stopped(); i++) { -+ io_context_.stop(); -+ for (int i = 0; i < 1000 && !io_context_.stopped(); i++) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - } -- assert(io_service_.stopped()); -+ assert(io_context_.stopped()); - if (asio_thread_.joinable()) { - try { - asio_thread_.join(); -@@ -183,7 +183,7 @@ void NetHost::start_accepting( - }); - } - --NetHost::NetHost(const uint16_t port) : acceptor_v4_(io_service_), acceptor_v6_(io_service_) { -+NetHost::NetHost(const uint16_t port) : acceptor_v4_(io_context_), acceptor_v6_(io_context_) { - - if (open_acceptor(&acceptor_v4_, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), port))) { - verb_log_info("[NetHost] Opening a listening IPv4 socket on TCP port %u", port); -@@ -198,7 +198,7 @@ NetHost::NetHost(const uint16_t port) : acceptor_v4_(io_service_), acceptor_v6_( - - asio_thread_ = std::thread([this]() { - verb_log_info("[NetHost] Starting networking thread"); -- io_service_.run(); -+ io_context_.run(); - verb_log_info("[NetHost] Stopping networking thread"); - }); - } -@@ -214,7 +214,7 @@ bool NetHost::open_acceptor(asio::ip::tcp::acceptor* acceptor, - acceptor->set_option(option_v6only); - } - acceptor->bind(endpoint); -- acceptor->listen(asio::socket_base::max_connections); -+ acceptor->listen(asio::socket_base::max_listen_connections); - return true; - } catch (const std::system_error&) { - return false; -diff --git a/src/network/nethost.h b/src/network/nethost.h -index 86fe4f920d5..7d17502b9d4 100644 ---- src/network/nethost.h -+++ src/network/nethost.h -@@ -101,8 +101,8 @@ class NetHost : public NetHostInterface { - std::map<NetHostInterface::ConnectionId, std::unique_ptr<BufferedConnection>> clients_; - /// The next client id that will be used - NetHostInterface::ConnectionId next_id_{1}; -- /// An io_service needed by asio. Primary needed for async operations. -- asio::io_service io_service_; -+ /// An io_context needed by asio. Primary needed for async operations. -+ asio::io_context io_context_; - /// The acceptor we get IPv4 connection requests to. - asio::ip::tcp::acceptor acceptor_v4_; - /// The acceptor we get IPv6 connection requests to. -diff --git a/src/network/network.cc b/src/network/network.cc -index f945b28b665..1c142f1f846 100644 ---- src/network/network.cc -+++ src/network/network.cc -@@ -30,17 +30,17 @@ bool do_resolve(const asio::ip::tcp& protocol, - uint16_t port) { - assert(addr != nullptr); - try { -- asio::io_service io_service; -- asio::ip::tcp::resolver resolver(io_service); -- asio::ip::tcp::resolver::query query(protocol, hostname, as_string(port)); -- asio::ip::tcp::resolver::iterator iter = resolver.resolve(query); -- if (iter == asio::ip::tcp::resolver::iterator()) { -+ asio::io_context io_context; -+ asio::ip::tcp::resolver resolver(io_context); -+ asio::ip::tcp::resolver::results_type iter = -+ resolver.resolve(protocol, hostname, as_string(port)); -+ if (iter.empty()) { - // Resolution failed - log_err("Could not resolve network name '%s:%u' to %s-address\n", hostname.c_str(), port, - ((protocol == asio::ip::tcp::v4()) ? "IPv4" : "IPv6")); - return false; - } -- addr->ip = iter->endpoint().address(); -+ addr->ip = iter.begin()->endpoint().address(); - addr->port = port; - verb_log_info("Resolved network name '%s:%u' to %s", hostname.c_str(), port, - addr->ip.to_string().c_str()); -@@ -64,7 +64,7 @@ bool NetAddress::resolve_to_v6(NetAddress* addr, const std::string& hostname, ui - - bool NetAddress::parse_ip(NetAddress* addr, const std::string& ip, uint16_t port) { - std::error_code ec; -- asio::ip::address new_addr = asio::ip::address::from_string(ip, ec); -+ asio::ip::address new_addr = asio::ip::make_address(ip, ec); - if (ec) { - return false; - } -diff --git a/src/network/network_lan_promotion.cc b/src/network/network_lan_promotion.cc -index 5e8e8f6b912..7cdbf1962ec 100644 ---- src/network/network_lan_promotion.cc -+++ src/network/network_lan_promotion.cc -@@ -75,7 +75,7 @@ int get_ip_version(const asio::ip::udp& version) { - * On Apple we have to specify the interface, forcing us to send our message over all interfaces we - * can find. - */ --LanBase::LanBase(uint16_t port) : socket_v4(io_service), socket_v6(io_service) { -+LanBase::LanBase(uint16_t port) : socket_v4(io_context), socket_v6(io_context) { - - #ifndef _WIN32 - // Iterate over all interfaces. If they support IPv4, store the broadcast-address -@@ -252,7 +252,7 @@ bool LanBase::broadcast(void const* const buf, size_t const len, uint16_t const - asio::ip::udp::socket& socket, const std::string& address) -> bool { - if (socket.is_open()) { - std::error_code ec; -- asio::ip::udp::endpoint destination(asio::ip::address::from_string(address), port); -+ asio::ip::udp::endpoint destination(asio::ip::make_address(address), port); - socket.send_to(asio::buffer(buf, len), destination, 0, ec); - if (!ec) { - return true; -diff --git a/src/network/network_lan_promotion.h b/src/network/network_lan_promotion.h -index dc1ccbadbc3..a227043ccf8 100644 ---- src/network/network_lan_promotion.h -+++ src/network/network_lan_promotion.h -@@ -135,7 +135,7 @@ struct LanBase { - void close_socket(asio::ip::udp::socket* socket); - - /// No idea what this does. I think it is only really used when asynchronous operations are done. -- asio::io_service io_service; -+ asio::io_context io_context; - /// The socket for IPv4. - asio::ip::udp::socket socket_v4; - /// The socket for IPv6. diff --git a/games/widelands/pkg-plist b/games/widelands/pkg-plist index 641a5861ddf5..4d232cc92308 100644 --- a/games/widelands/pkg-plist +++ b/games/widelands/pkg-plist @@ -9,4 +9,4 @@ share/icons/hicolor/32x32/apps/org.widelands.Widelands.png share/icons/hicolor/48x48/apps/org.widelands.Widelands.png share/icons/hicolor/64x64/apps/org.widelands.Widelands.png share/man/man6/widelands.6.gz -share/metainfo/org.widelands.Widelands.appdata.xml +share/metainfo/org.widelands.Widelands.metainfo.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b06473.2030a.50e8922c>