From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1725730-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B7E881582EF
for <garchives@archives.gentoo.org>; Sat, 08 Mar 2025 23:17:08 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 9E7AA343093
for <garchives@archives.gentoo.org>; Sat, 08 Mar 2025 23:17:08 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id B364B110370;
Sat, 08 Mar 2025 23:17:04 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id A33D1110370
for <gentoo-commits@lists.gentoo.org>; Sat, 08 Mar 2025 23:17:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 259F5343051
for <gentoo-commits@lists.gentoo.org>; Sat, 08 Mar 2025 23:17:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8507E288C
for <gentoo-commits@lists.gentoo.org>; Sat, 08 Mar 2025 23:17:02 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1741475783.ccc8abc95f8e4d8d3f69025c940eb791a13d2e7f.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-strategy/wesnoth/files/wesnoth-1.18.3-boost-1.87.patch games-strategy/wesnoth/wesnoth-1.18.3.ebuild
X-VCS-Directories: games-strategy/wesnoth/ games-strategy/wesnoth/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ccc8abc95f8e4d8d3f69025c940eb791a13d2e7f
X-VCS-Branch: master
Date: Sat, 08 Mar 2025 23:17:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d853cb01-84df-49bf-8f41-3b6cb32c0896
X-Archives-Hash: fca73b2e640ba787eb1876a252bc3e5b
commit: ccc8abc95f8e4d8d3f69025c940eb791a13d2e7f
Author: Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Sat Jan 25 07:09:33 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 8 23:16:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc8abc9
games-strategy/wesnoth: fix build with boost-1.87
The patch included herein is based upon the upstream patch at commit
782ab2df3efd4abc1fbab416b9a87d50cc5d066d. The upstream patch did not
cleanly apply due to other repository changes since the release of
this version of wesnoth.
No revbump has been applied in accordance with the devmanual, i.e.
it fixes a build-time issue.
The homepage has also been adjusted to point to the https url.
Closes: https://bugs.gentoo.org/949211
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Closes: https://github.com/gentoo/gentoo/pull/40296
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../wesnoth/files/wesnoth-1.18.3-boost-1.87.patch | 175 +++++++++++++++++++++
games-strategy/wesnoth/wesnoth-1.18.3.ebuild | 6 +-
2 files changed, 179 insertions(+), 2 deletions(-)
diff --git 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
new file mode 100644
index 000000000000..cba83d57afac
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.3-boost-1.87.patch
@@ -0,0 +1,175 @@
+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();
diff --git a/games-strategy/wesnoth/wesnoth-1.18.3.ebuild b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
index 4b40f0539945..f12b18fb00fc 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
inherit cmake flag-o-matic xdg
DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
+HOMEPAGE="https://www.wesnoth.org
https://github.com/wesnoth/wesnoth"
SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
@@ -43,6 +43,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}"/${PN}-1.18.3-boost-1.87.patch )
+
src_prepare() {
cmake_src_prepare