pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/wesnoth
Module Name: pkgsrc
Committed By: adam
Date: Sat Jan 25 22:58:23 UTC 2025
Modified Files:
pkgsrc/games/wesnoth: Makefile distinfo
Added Files:
pkgsrc/games/wesnoth/patches: patch-src_server_campaignd_server.cpp
patch-src_server_common_forum__user__handler.cpp
patch-src_server_common_forum__user__handler.hpp
patch-src_server_common_server__base.cpp
patch-src_server_common_server__base.hpp
patch-src_server_common_user__handler.hpp
patch-src_server_wesnothd_game.cpp
patch-src_server_wesnothd_server.cpp
Log Message:
wesnoth: Fix build with boost >= 1.87.0
To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 pkgsrc/games/wesnoth/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/games/wesnoth/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/games/wesnoth/patches/patch-src_server_campaignd_server.cpp \
pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.cpp \
pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.hpp \
pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.cpp \
pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.hpp \
pkgsrc/games/wesnoth/patches/patch-src_server_common_user__handler.hpp \
pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_game.cpp \
pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_server.cpp
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/Makefile
diff -u pkgsrc/games/wesnoth/Makefile:1.225 pkgsrc/games/wesnoth/Makefile:1.226
--- pkgsrc/games/wesnoth/Makefile:1.225 Sat Jan 25 21:33:37 2025
+++ pkgsrc/games/wesnoth/Makefile Sat Jan 25 22:58:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.225 2025/01/25 21:33:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.226 2025/01/25 22:58:22 adam Exp $
DISTNAME= wesnoth-1.18.3
PKGREVISION= 2
@@ -11,17 +11,6 @@ HOMEPAGE= https://www.wesnoth.org/
COMMENT= Fantasy turn-based strategy game
LICENSE= gnu-gpl-v2
-# In file included from /pbulk/work/games/wesnoth/work/wesnoth-1.18.3/src/server/common/server_base.cpp:16:
-# /pbulk/work/games/wesnoth/work/wesnoth-1.18.3/src/server/common/server_base.hpp:33:10: fatal error: boost/asio/io_service.hpp: No such file or directory
-# 33 | #include <boost/asio/io_service.hpp>
-# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# This header file existed in 1.86 but no longer in 1.87:
-#
-# https://www.boost.org/doc/libs/1_86_0/boost/asio/io_service.hpp
-# https://www.boost.org/doc/libs/1_87_0/boost/asio/io_service.hpp
-BROKEN+= "Incompatible with boost>=1.87"
-
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
USE_CXX_FEATURES+= c++17
Index: pkgsrc/games/wesnoth/distinfo
diff -u pkgsrc/games/wesnoth/distinfo:1.92 pkgsrc/games/wesnoth/distinfo:1.93
--- pkgsrc/games/wesnoth/distinfo:1.92 Sun Nov 24 19:45:10 2024
+++ pkgsrc/games/wesnoth/distinfo Sat Jan 25 22:58:22 2025
@@ -1,8 +1,16 @@
-$NetBSD: distinfo,v 1.92 2024/11/24 19:45:10 adam Exp $
+$NetBSD: distinfo,v 1.93 2025/01/25 22:58:22 adam Exp $
BLAKE2s (wesnoth-1.18.3.tar.bz2) = dc4cd90398171a974ba410b3c27b882e307c46d3dea518f5599d256455485d0d
SHA512 (wesnoth-1.18.3.tar.bz2) = def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a
Size (wesnoth-1.18.3.tar.bz2) = 461694247 bytes
SHA1 (patch-CMakeLists.txt) = e1c4f9bb90529e0a1025c3ce6751b50ddb8171fd
SHA1 (patch-src_CMakeLists.txt) = 7917bd0a3aedf3523a73e4542cbdf54c08a78f77
+SHA1 (patch-src_server_campaignd_server.cpp) = e30bc66bc8f52dd0fbdf8e658512a2501e528883
+SHA1 (patch-src_server_common_forum__user__handler.cpp) = 2e0e6955b9f02db2ce3a25ba5dd936563e764693
+SHA1 (patch-src_server_common_forum__user__handler.hpp) = 945e6a9cdf7e2e6abdb4bb7e8e8a9b6f8baebcd2
+SHA1 (patch-src_server_common_server__base.cpp) = 0b4ce250915b9bc7d7b15d7d7ad40fb170d0d881
+SHA1 (patch-src_server_common_server__base.hpp) = b67fa674e2305c79153dced4f4386751ff718259
+SHA1 (patch-src_server_common_user__handler.hpp) = 7a9a82d68c0a3e739affbcef08ba6dab2d11536c
+SHA1 (patch-src_server_wesnothd_game.cpp) = 5780f8df69e5f8d820733b63d8a39676e538c05b
+SHA1 (patch-src_server_wesnothd_server.cpp) = 974261c428ab56bf3d4014a23ea62055ad4105e2
SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67
Added files:
Index: pkgsrc/games/wesnoth/patches/patch-src_server_campaignd_server.cpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_campaignd_server.cpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_campaignd_server.cpp Sat Jan 25 22:58:22 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_server_campaignd_server.cpp,v 1.1 2025/01/25 22:58:22 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/campaignd/server.cpp.orig 2025-01-25 22:33:31.575682044 +0000
++++ src/server/campaignd/server.cpp
+@@ -735,7 +735,7 @@ void server::handle_sighup(const boost::
+
+ 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));
+ }
Index: pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.cpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.cpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.cpp Sat Jan 25 22:58:22 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_server_common_forum__user__handler.cpp,v 1.1 2025/01/25 22:58:22 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/common/forum_user_handler.cpp.orig 2025-01-25 22:34:14.678468548 +0000
++++ 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::str
+ 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);
Index: pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.hpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.hpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_common_forum__user__handler.hpp Sat Jan 25 22:58:22 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_server_common_forum__user__handler.hpp,v 1.1 2025/01/25 22:58:22 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/common/forum_user_handler.hpp.orig 2024-10-28 17:46:29.000000000 +0000
++++ 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.
Index: pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.cpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.cpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.cpp Sat Jan 25 22:58:23 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_server_common_server__base.cpp,v 1.1 2025/01/25 22:58:23 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/common/server_base.cpp.orig 2024-10-28 17:46:29.000000000 +0000
++++ src/server/common/server_base.cpp
+@@ -43,6 +43,10 @@
+ #endif
+ #include <boost/asio/write.hpp>
+
++#ifndef BOOST_NO_EXCEPTIONS
++#include <boost/exception/diagnostic_information.hpp>
++#endif
++
+ #include <array>
+ #include <ctime>
+ #include <functional>
Index: pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.hpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.hpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_common_server__base.hpp Sat Jan 25 22:58:23 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_server_common_server__base.hpp,v 1.1 2025/01/25 22:58:23 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/common/server_base.hpp.orig 2025-01-25 22:41:27.055783416 +0000
++++ 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_;
Index: pkgsrc/games/wesnoth/patches/patch-src_server_common_user__handler.hpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_common_user__handler.hpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_common_user__handler.hpp Sat Jan 25 22:58:23 2025
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_server_common_user__handler.hpp,v 1.1 2025/01/25 22:58:23 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/common/user_handler.hpp.orig 2025-01-25 22:42:16.786148897 +0000
++++ 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;
Index: pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_game.cpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_game.cpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_game.cpp Sat Jan 25 22:58:23 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_server_wesnothd_game.cpp,v 1.1 2025/01/25 22:58:23 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/wesnothd/game.cpp.orig 2025-01-25 22:43:20.211521144 +0000
++++ 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)
Index: pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_server.cpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_server.cpp:1.1
--- /dev/null Sat Jan 25 22:58:23 2025
+++ pkgsrc/games/wesnoth/patches/patch-src_server_wesnothd_server.cpp Sat Jan 25 22:58:23 2025
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_server_wesnothd_server.cpp,v 1.1 2025/01/25 22:58:23 adam Exp $
+
+Fix build with boost >= 1.87.0
+https://github.com/wesnoth/wesnoth/pull/9653
+
+--- src/server/wesnothd/server.cpp.orig 2025-01-25 22:43:53.491385858 +0000
++++ src/server/wesnothd/server.cpp
+@@ -293,14 +293,14 @@ void server::handle_graceful_timeout(con
+ 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::
+ 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();
Home |
Main Index |
Thread Index |
Old Index