commit: 59ab0c9d5731a00abef9c36894d089f0f6accfda Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Feb 22 11:40:48 2026 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Feb 22 12:03:40 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ab0c9d
games-strategy/widelands: drop 1.2.1 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-strategy/widelands/Manifest | 1 - .../widelands/files/widelands-1.2.1-asio1.34.patch | 127 --------------------- .../widelands/files/widelands-1.2.1-cstdint.patch | 16 --- games-strategy/widelands/widelands-1.2.1.ebuild | 66 ----------- 4 files changed, 210 deletions(-) diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest index 955d96476c0a..847ec8fa1c3e 100644 --- a/games-strategy/widelands/Manifest +++ b/games-strategy/widelands/Manifest @@ -1,2 +1 @@ -DIST widelands-1.2.1.tar.gz 457853247 BLAKE2B 8af9febc4379f52f2343bff244e7ec3c42e63792e2a93f61446df81a101201d1471d20c8c1b73d6267f5066d3861bfc802227b2abd4b0fc172b447d0b598ddfd SHA512 9a7449096dab8ff07ac12354f4fb659fcbe419381d289e869c134c5b804c8817f9fbffb854283ab0b5bca541e9649f7f0e7658fd2765bc2a8a8f705dc24f01d8 DIST widelands-1.3.tar.gz 468148267 BLAKE2B 2b8e2e725ff1dc9e355490ca6909f71683669883400c318e82ef2d464463f8810217bdf47cb047dda05c8f970fd04569e48304aba9afe8a203bdd45a01edcf16 SHA512 f782ff33187574a98f6045bb71cc547126f4acd8e83795ea2c8e9962bef6ed723588e2741d35c11e4682d8d7eaecf5855b03c8bbbc91a4be5c3845140eb0cb66 diff --git a/games-strategy/widelands/files/widelands-1.2.1-asio1.34.patch b/games-strategy/widelands/files/widelands-1.2.1-asio1.34.patch deleted file mode 100644 index f1a014e0cfcd..000000000000 --- a/games-strategy/widelands/files/widelands-1.2.1-asio1.34.patch +++ /dev/null @@ -1,127 +0,0 @@ -https://bugs.gentoo.org/955174 -https://github.com/widelands/widelands/pull/6665 ---- a/src/network/bufferedconnection.cc -+++ b/src/network/bufferedconnection.cc -@@ -143,8 +143,8 @@ - // 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()) { -@@ -336,3 +336,3 @@ - BufferedConnection::BufferedConnection(const NetAddress& host) -- : socket_(io_service_), currently_sending_(false) { -+ : socket_(io_context_), currently_sending_(false) { - -@@ -355,3 +355,3 @@ - verb_log_info("[BufferedConnection] Starting networking thread\n"); -- io_service_.run(); -+ io_context_.run(); - verb_log_info("[BufferedConnection] Stopping networking thread\n"); -@@ -366,3 +366,3 @@ - --BufferedConnection::BufferedConnection() : socket_(io_service_) { -+BufferedConnection::BufferedConnection() : socket_(io_context_) { - } -@@ -381,3 +381,3 @@ - verb_log_info("[BufferedConnection] Starting networking thread"); -- io_service_.run(); -+ io_context_.run(); - verb_log_info("[BufferedConnection] Stopping networking thread"); ---- a/src/network/bufferedconnection.h -+++ b/src/network/bufferedconnection.h -@@ -314,4 +314,4 @@ - -- /// 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_; - ---- a/src/network/nethost.cc -+++ b/src/network/nethost.cc -@@ -69,7 +69,7 @@ - // 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()) { -@@ -185,3 +185,3 @@ - --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_) { - -@@ -200,3 +200,3 @@ - verb_log_info("[NetHost] Starting networking thread"); -- io_service_.run(); -+ io_context_.run(); - verb_log_info("[NetHost] Stopping networking thread"); -@@ -216,3 +216,3 @@ - acceptor->bind(endpoint); -- acceptor->listen(asio::socket_base::max_connections); -+ acceptor->listen(asio::socket_base::max_listen_connections); - return true; ---- a/src/network/nethost.h -+++ b/src/network/nethost.h -@@ -103,4 +103,4 @@ - 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. ---- a/src/network/network.cc -+++ b/src/network/network.cc -@@ -32,7 +32,7 @@ - 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 -@@ -42,3 +42,3 @@ - } -- addr->ip = iter->endpoint().address(); -+ addr->ip = iter.begin()->endpoint().address(); - addr->port = port; -@@ -66,3 +66,3 @@ - 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) { ---- a/src/network/network_lan_promotion.cc -+++ b/src/network/network_lan_promotion.cc -@@ -77,3 +77,3 @@ - */ --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) { - -@@ -252,3 +252,3 @@ - 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); ---- a/src/network/network_lan_promotion.h -+++ b/src/network/network_lan_promotion.h -@@ -135,3 +135,3 @@ - /// 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. diff --git a/games-strategy/widelands/files/widelands-1.2.1-cstdint.patch b/games-strategy/widelands/files/widelands-1.2.1-cstdint.patch deleted file mode 100644 index 1181f468a5dd..000000000000 --- a/games-strategy/widelands/files/widelands-1.2.1-cstdint.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/938230 -https://github.com/widelands/widelands/pull/6522 ---- a/src/base/format/abstract_node.h -+++ b/src/base/format/abstract_node.h -@@ -21,2 +21,4 @@ - -+#include <cstdint> -+ - namespace format_impl { ---- a/src/logic/map_objects/tribes/training_attribute.h -+++ b/src/logic/map_objects/tribes/training_attribute.h -@@ -21,2 +21,4 @@ - -+#include <cstdint> -+ - namespace Widelands { diff --git a/games-strategy/widelands/widelands-1.2.1.ebuild b/games-strategy/widelands/widelands-1.2.1.ebuild deleted file mode 100644 index 96bdcb6d71d1..000000000000 --- a/games-strategy/widelands/widelands-1.2.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -inherit cmake flag-o-matic python-any-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/widelands/widelands.git"; -else - SRC_URI=" - https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="Game similar to Settlers 2" -HOMEPAGE="https://www.widelands.org/"; - -LICENSE="GPL-2+ || ( Apache-2.0 GPL-3 ) BitstreamVera BSD CC-BY-SA-3.0 MIT OFL-1.1" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/icu:= - media-libs/glew:0= - media-libs/libglvnd - media-libs/libpng:= - media-libs/libsdl2[opengl,sound,video] - media-libs/sdl2-image[jpeg,png] - media-libs/sdl2-mixer[vorbis] - media-libs/sdl2-ttf - virtual/minizip:= - virtual/libintl -" -DEPEND=" - ${RDEPEND} - dev-cpp/asio -" -BDEPEND=" - ${PYTHON_DEPS} - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${P}-asio1.34.patch - "${FILESDIR}"/${P}-cstdint.patch -) - -src_configure() { - append-cflags -std=gnu17 - - local mycmakeargs=( - -DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF} - -DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin - -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN} - -DGTK_UPDATE_ICON_CACHE=OFF - -DOPTION_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -}
