games-strategy/wesnoth: drop 1.18.3, 1.19.10

Signed-off-by: Pacho Ramos <pacho@gentoo.org>
2026-09-24 04:59:14 -07:00 · 2025-06-28 19:23:54 +02:00
parent 4d7e10d19e
commit b6747c959b
5 changed files with 0 additions and 445 deletions
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,4 @@
-DIST wesnoth-1.18.3.tar.bz2 461694247 BLAKE2B 1998e2fdff56271dd86c390e3c25dcbaa98b4f131f15584e5d3f2f5866856a69aebf9c8d97b1126601b3e08467a9410f3ba7b53c253737c6bbf62ccb1e9ba96f SHA512 def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a
 DIST wesnoth-1.18.4.tar.bz2 461847477 BLAKE2B ebeae7c50c3583a16744ad7e36e2330b8babfd323cc152a9001e3f11018447ada64d070506c5d5ebaa2b9041861dc81680354b4f3d55b4eb118f887b4ff5a4f6 SHA512 c86538dae0c5d8c0c7270ab8e13ca2a5b9b6ff44e84789bc803d2135615e55dfdd34fd6b56f325f448940fcc396d884c533d067312b988b27c155157068db3bc
 DIST wesnoth-1.18.5.tar.bz2 461916727 BLAKE2B 9a48235e32091f3977aef7fa396460e7ff08c988e722f591aac980849a0ee8c29557bac426b5a33ecd646efafd86cb43ccb416dc7c43c9be2819cea9ed7891d9 SHA512 43137cd90f0d64eab579d58aadbf3cff045ead5709040e84b8299e33d2515182b0c5c0747cc06f9d9a4155e160dbee59963a1165392dde0c3cdb85c9c70ebc0b
-DIST wesnoth-1.19.10.tar.bz2 546744036 BLAKE2B a80fb0bf5b46f3021d4b05d3d4f5aebd3895131dfec14aa9e42cfa12eefaa43d250e09d47d8e21946693366ad1e043188106508013158d39febf1c3708c08d78 SHA512 ed3400053ba3901c450fa9930de27ef0dc4e34c4b1b8b83b60f1ba2547061eb69529ebbee390cd9c471bfff5d11a8aa9a5b67b11339416e52f8269822592f5e9
 DIST wesnoth-1.19.11.tar.bz2 547541350 BLAKE2B d1b82cdcfdb15a0a5ac3648a94fb85aee9e2aabdff306c5fb9e19ae2411423e74c6c0218a3d09c66b718371c46bb4a76dd40512b2ead484cc3410fb7980092b7 SHA512 0f782c61c9f2f2193b1462768742488229b93bc95772ad8e434583f605dbed95ab0ccf39f3fc3a39ad35970f3dad84e318f543180795ad3b04c6e6765bfc3d70
 DIST wesnoth-1.19.13.tar.bz2 547180467 BLAKE2B 0cd9bf89538da980862e71fc7ab520518523cfca49d6732a50d531d49065e886b79d5c355cb7df2fe5779f961b7734979cb253534d8ec901e9d52184ae0cc853 SHA512 94f1420902e882f47c6c5cc1832becd419128707b06e662afc74f303fec71a6cb6890a03f9f37c3982603d597c61d4cfeb352abac23bd3a73091c8341210b13a
--- a/games-strategy/wesnoth/files/wesnoth-1.18.3-boost-1.87.patch
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.3-boost-1.87.patch
@@ -1,175 +0,0 @@
-diff --git a/src/server/campaignd/server.cpp b/src/server/campaignd/server.cpp
-index 31a7df8..88a141a 100644
--- a/src/server/campaignd/server.cpp
-+++ b/src/server/campaignd/server.cpp
-@@ -735,7 +735,7 @@ void server::handle_sighup(const boost::system::error_code&, int)
- 
- void server::flush_cfg()
- {
-	flush_timer_.expires_from_now(std::chrono::minutes(10));
-+	flush_timer_.expires_after(std::chrono::minutes(10));
- 	flush_timer_.async_wait(std::bind(&server::handle_flush, this, std::placeholders::_1));
- }
- 
-diff --git a/src/server/common/forum_user_handler.cpp b/src/server/common/forum_user_handler.cpp
-index ed689cb..1fbac6e 100644
--- a/src/server/common/forum_user_handler.cpp
-+++ b/src/server/common/forum_user_handler.cpp
-@@ -207,7 +207,7 @@ std::string fuh::get_tournaments(){
- 	return conn_.get_tournaments();
- }
- 
-void fuh::async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) {
-+void fuh::async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) {
- 	boost::asio::post([this, &s, player, player_id, offset, &io_service, search_game_name, search_content_type, search_content] {
- 		boost::asio::post(io_service, [player, &s, doc = conn_.get_game_history(player_id, offset, search_game_name, search_content_type, search_content)]{
- 			s.send_to_player(player, *doc);
-@@ -235,7 +235,7 @@ void fuh::db_set_oos_flag(const std::string& uuid, int game_id){
- 	conn_.set_oos_flag(uuid, game_id);
- }
- 
-void fuh::async_test_query(boost::asio::io_service& io_service, int limit) {
-+void fuh::async_test_query(boost::asio::io_context& io_service, int limit) {
- 	boost::asio::post([this, limit, &io_service] {
- 		ERR_UH << "async test query starts!";
- 		int i = conn_.async_test_query(limit);
-diff --git a/src/server/common/forum_user_handler.hpp b/src/server/common/forum_user_handler.hpp
-index d050f90..f8c2b01 100644
--- a/src/server/common/forum_user_handler.hpp
-+++ b/src/server/common/forum_user_handler.hpp
-@@ -133,7 +133,7 @@ public:
- 	 * @param search_content_type The content type to query for (ie: scenario)
- 	 * @param search_content Query for games using this content ID. Supports leading and/or trailing wildcards.
- 	 */
-	void async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content);
-+	void async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content);
- 
- 	/**
- 	 * Inserts game related information.
-@@ -203,7 +203,7 @@ public:
- 	 * @param io_service The boost io_service to use to post the query results back to the main boost::asio thread.
- 	 * @param limit How many recursions to make in the query.
- 	 */
-	void async_test_query(boost::asio::io_service& io_service, int limit);
-+	void async_test_query(boost::asio::io_context& io_service, int limit);
- 
- 	/**
- 	 * Checks whether a forum thread with @a topic_id exists.
-diff --git a/src/server/common/server_base.cpp b/src/server/common/server_base.cpp
-index 2c1a581..0aca915 100644
--- a/src/server/common/server_base.cpp
-+++ b/src/server/common/server_base.cpp
-@@ -41,6 +41,10 @@
- #ifndef _WIN32
- #include <boost/asio/read_until.hpp>
- #endif
-+#ifndef BOOST_NO_EXCEPTIONS
-+#include <boost/exception/diagnostic_information.hpp>
-+#endif
-+
- #include <boost/asio/write.hpp>
- 
- #include <array>
-diff --git a/src/server/common/server_base.hpp b/src/server/common/server_base.hpp
-index 94aac7e..e40b6ca 100644
--- a/src/server/common/server_base.hpp
-+++ b/src/server/common/server_base.hpp
-@@ -30,7 +30,7 @@
- #include "serialization/unicode_cast.hpp"
- #endif
- 
-#include <boost/asio/io_service.hpp>
-+#include <boost/asio/io_context.hpp>
- #include <boost/asio/ip/tcp.hpp>
- #ifndef _WIN32
- #include <boost/asio/posix/stream_descriptor.hpp>
-@@ -150,7 +150,7 @@ public:
- protected:
- 	unsigned short port_;
- 	bool keep_alive_;
-	boost::asio::io_service io_service_;
-+	boost::asio::io_context io_service_;
- 	boost::asio::ssl::context tls_context_ { boost::asio::ssl::context::sslv23 };
- 	bool tls_enabled_ { false };
- 	boost::asio::ip::tcp::acceptor acceptor_v6_;
-diff --git a/src/server/common/user_handler.hpp b/src/server/common/user_handler.hpp
-index d8e72f1..24b727f 100644
--- a/src/server/common/user_handler.hpp
-+++ b/src/server/common/user_handler.hpp
-@@ -22,7 +22,7 @@ class config;
- #include <ctime>
- #include <string>
- 
-#include <boost/asio/io_service.hpp>
-+#include <boost/asio/io_context.hpp>
- 
- #include "server/wesnothd/player_connection.hpp"
- 
-@@ -139,13 +139,13 @@ public:
- 
- 	virtual std::string get_uuid() = 0;
- 	virtual std::string get_tournaments() = 0;
-	virtual void async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) =0;
-+	virtual void async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) =0;
- 	virtual void db_insert_game_info(const std::string& uuid, int game_id, const std::string& version, const std::string& name, int reload, int observers, int is_public, int has_password) = 0;
- 	virtual void db_update_game_end(const std::string& uuid, int game_id, const std::string& replay_location) = 0;
- 	virtual void db_insert_game_player_info(const std::string& uuid, int game_id, const std::string& username, int side_number, int is_host, const std::string& faction, const std::string& version, const std::string& source, const std::string& current_user, const std::string& leaders) = 0;
- 	virtual unsigned long long db_insert_game_content_info(const std::string& uuid, int game_id, const std::string& type, const std::string& name, const std::string& id, const std::string& addon_id, const std::string& addon_version) = 0;
- 	virtual void db_set_oos_flag(const std::string& uuid, int game_id) = 0;
-	virtual void async_test_query(boost::asio::io_service& io_service, int limit) = 0;
-+	virtual void async_test_query(boost::asio::io_context& io_service, int limit) = 0;
- 	virtual bool db_topic_id_exists(int topic_id) = 0;
- 	virtual void db_insert_addon_info(const std::string& instance_version, const std::string& id, const std::string& name, const std::string& type, const std::string& version, bool forum_auth, int topic_id, const std::string uploader) = 0;
- 	virtual unsigned long long db_insert_login(const std::string& username, const std::string& ip, const std::string& version) = 0;
-diff --git a/src/server/wesnothd/game.cpp b/src/server/wesnothd/game.cpp
-index faeb255..ec95bd4 100644
--- a/src/server/wesnothd/game.cpp
-+++ b/src/server/wesnothd/game.cpp
-@@ -27,6 +27,8 @@
- #include <iomanip>
- #include <sstream>
- 
-+#include <boost/coroutine/exceptions.hpp>
-+
- static lg::log_domain log_server("server");
- #define ERR_GAME LOG_STREAM(err, log_server)
- #define WRN_GAME LOG_STREAM(warn, log_server)
-diff --git a/src/server/wesnothd/server.cpp b/src/server/wesnothd/server.cpp
-index 7c4b2a0..587b02a 100644
--- a/src/server/wesnothd/server.cpp
-+++ b/src/server/wesnothd/server.cpp
-@@ -293,14 +293,14 @@ void server::handle_graceful_timeout(const boost::system::error_code& error)
- 		process_command("msg All games ended. Shutting down now. Reconnect to the new server instance.", "system");
- 		BOOST_THROW_EXCEPTION(server_shutdown("graceful shutdown timeout"));
- 	} else {
-		timer_.expires_from_now(std::chrono::seconds(1));
-+		timer_.expires_after(std::chrono::seconds(1));
- 		timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
- 	}
- }
- 
- void server::start_lan_server_timer()
- {
-	lan_server_timer_.expires_from_now(std::chrono::seconds(lan_server_));
-+	lan_server_timer_.expires_after(std::chrono::seconds(lan_server_));
- 	lan_server_timer_.async_wait([this](const boost::system::error_code& ec) { handle_lan_server_shutdown(ec); });
- }
- 
-@@ -2120,7 +2120,7 @@ void server::shut_down_handler(
- 		acceptor_v6_.close();
- 		acceptor_v4_.close();
- 
-		timer_.expires_from_now(std::chrono::seconds(10));
-+		timer_.expires_after(std::chrono::seconds(10));
- 		timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
- 
- 		process_command(
-@@ -2151,7 +2151,7 @@ void server::restart_handler(const std::string& issuer_name,
- 		graceful_restart = true;
- 		acceptor_v6_.close();
- 		acceptor_v4_.close();
-		timer_.expires_from_now(std::chrono::seconds(10));
-+		timer_.expires_after(std::chrono::seconds(10));
- 		timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
- 
- 		start_new_server();
--- a/games-strategy/wesnoth/files/wesnoth-1.19.10-boost-1.87.patch
+++ b/games-strategy/wesnoth/files/wesnoth-1.19.10-boost-1.87.patch
@@ -1,45 +0,0 @@
-From 28b1fbc3bd8f3f44bdfa911e946f391dbc7717ea Mon Sep 17 00:00:00 2001
-From: Jon Daniel <joneqdaniel@gmail.com>
-Date: Wed, 26 Mar 2025 20:17:55 +0100
-Subject: [PATCH] fix boost_charconv linkage
-
---
- src/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c3a2c52d7412b..a3d9e6daa380f 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -226,6 +226,7 @@ if(ENABLE_GAME)
- 		Boost::coroutine
- 		Boost::locale
- 		Boost::filesystem
-+		boost_charconv
- 		Fontconfig::Fontconfig
- 		SDL2::SDL2
- 		SDL2::SDL2main
-@@ -273,6 +274,7 @@ if(ENABLE_TESTS)
- 		Boost::locale
- 		Boost::filesystem
- 		Boost::unit_test_framework
-+		boost_charconv
- 		Fontconfig::Fontconfig
- 		SDL2::SDL2
- 		SDL2::SDL2main
-@@ -321,6 +323,7 @@ if(ENABLE_SERVER)
- 		Boost::coroutine
- 		Boost::locale
- 		Boost::filesystem
-+		boost_charconv
- 	)
- 	if(MSVC)
- 		target_link_options(wesnothd PRIVATE /WX)
-@@ -362,6 +365,7 @@ if(ENABLE_CAMPAIGN_SERVER)
- 		Boost::coroutine
- 		Boost::locale
- 		Boost::filesystem
-+		boost_charconv
- 	)
- 	if(MSVC)
- 		target_link_options(campaignd PRIVATE /WX)
--- a/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
@@ -1,112 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="https://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-	acct-group/wesnoth
-	acct-user/wesnoth
-	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.10:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		dev-libs/openssl:0=
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0=
-		dbus? ( sys-apps/dbus )
-	)"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.3-boost-1.87.patch
-	"${FILESDIR}"/${PN}-1.18.3-gcc15.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local lang langs=()
-		for lang in $(cat po/LINGUAS) ; do
-			has ${lang} ${LINGUAS} && langs+=( ${lang} )
-		done
-		echo "${langs[@]}" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-
-	local mycmakeargs=()
-
-	if use dedicated || use server ; then
-		mycmakeargs+=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs+=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		)
-	cmake_src_configure
-}
-
-src_test() {
-	# Allow SDL_Mixer test to pass, bug #931551
-	SDL_AUDIODRIVER=dummy cmake_src_test
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake_src_install
-	if use dedicated || use server ; then
-		rmdir "${ED}"/run{/wesnothd,} || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
--- a/games-strategy/wesnoth/wesnoth-1.19.10.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.19.10.ebuild
@@ -1,111 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-	acct-group/wesnoth
-	acct-user/wesnoth
-	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.18:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		dev-libs/openssl:0=
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0=
-		dbus? ( sys-apps/dbus )
-	)"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.19.10-boost-1.87.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local lang langs=()
-		for lang in $(cat po/LINGUAS) ; do
-			has ${lang} ${LINGUAS} && langs+=( ${lang} )
-		done
-		echo "${langs[@]}" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-
-	local mycmakeargs=()
-
-	if use dedicated || use server ; then
-		mycmakeargs+=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs+=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		)
-	cmake_src_configure
-}
-
-src_test() {
-	# Allow SDL_Mixer test to pass, bug #931551
-	SDL_AUDIODRIVER=dummy cmake_src_test
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake_src_install
-	if use dedicated || use server ; then
-		rmdir "${ED}"/run{/wesnothd,} || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}