Compare commits
11 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 80c5a6a797 | |||
| c4496def3a | |||
| 087ba4133f | |||
| 7b1c29b464 | |||
| 2f089f73a1 | |||
| 04f5bde11c | |||
| 7a85883c97 | |||
| 98e2273753 | |||
| 9ee49b39cd | |||
| d156ebb9ed | |||
| 685028f290 |
47
boost.patch
Normal file
47
boost.patch
Normal file
@@ -0,0 +1,47 @@
|
||||
diff -Nrua wesnoth-1.18.5.orig/CMakeLists.txt wesnoth-1.18.5/CMakeLists.txt
|
||||
--- wesnoth-1.18.5.orig/CMakeLists.txt
|
||||
+++ wesnoth-1.18.5/CMakeLists.txt
|
||||
@@ -93,7 +93,7 @@
|
||||
find_library(SECURITY_LIBRARY Security REQUIRED)
|
||||
endif()
|
||||
|
||||
-find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph)
|
||||
+find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex thread random coroutine locale filesystem graph)
|
||||
find_package(ICU REQUIRED COMPONENTS data i18n uc)
|
||||
|
||||
# no, gettext executables are not required when NLS is deactivated
|
||||
diff -Nrua wesnoth-1.18.5.orig/src/CMakeLists.txt wesnoth-1.18.5/src/CMakeLists.txt
|
||||
--- wesnoth-1.18.5.orig/src/CMakeLists.txt
|
||||
+++ wesnoth-1.18.5/src/CMakeLists.txt
|
||||
@@ -248,7 +248,6 @@
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
- Boost::system
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
@@ -295,7 +294,6 @@
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
- Boost::system
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
@@ -344,7 +342,6 @@
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
- Boost::system
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
@@ -385,7 +382,6 @@
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
- Boost::system
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5f9f6d6105d48cf614eb06cf72273d62931dcb5d4982d75e851c3fa2fa70553a
|
||||
size 461290798
|
||||
3
wesnoth-1.18.6.tar.bz2
Normal file
3
wesnoth-1.18.6.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6bb8b17854c974bc66cb7a2574a53fe9efb4d2c138bb1373032e57788204985e
|
||||
size 467190064
|
||||
@@ -1,111 +0,0 @@
|
||||
diff -Nur wesnoth-1.18.2-orig/src/server/campaignd/server.cpp wesnoth-1.18.2/src/server/campaignd/server.cpp
|
||||
--- wesnoth-1.18.2-orig/src/server/campaignd/server.cpp 2024-06-29 05:42:43.000000000 +0200
|
||||
+++ wesnoth-1.18.2/src/server/campaignd/server.cpp 2024-10-14 17:45:43.171889831 +0200
|
||||
@@ -490,14 +490,22 @@
|
||||
{
|
||||
boost::asio::spawn(io_service_, [this, socket](boost::asio::yield_context yield) {
|
||||
serve_requests(socket, yield);
|
||||
- });
|
||||
+ }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
+ );
|
||||
}
|
||||
|
||||
void server::handle_new_client(socket_ptr socket)
|
||||
{
|
||||
boost::asio::spawn(io_service_, [this, socket](boost::asio::yield_context yield) {
|
||||
serve_requests(socket, yield);
|
||||
- });
|
||||
+ }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
+ );
|
||||
}
|
||||
|
||||
template<class Socket>
|
||||
diff -Nur wesnoth-1.18.2-orig/src/server/common/server_base.cpp wesnoth-1.18.2/src/server/common/server_base.cpp
|
||||
--- wesnoth-1.18.2-orig/src/server/common/server_base.cpp 2024-06-29 05:42:43.000000000 +0200
|
||||
+++ wesnoth-1.18.2/src/server/common/server_base.cpp 2024-10-01 18:43:29.461438175 +0200
|
||||
@@ -81,10 +81,18 @@
|
||||
void server_base::start_server()
|
||||
{
|
||||
boost::asio::ip::tcp::endpoint endpoint_v6(boost::asio::ip::tcp::v6(), port_);
|
||||
- boost::asio::spawn(io_service_, [this, endpoint_v6](boost::asio::yield_context yield) { serve(yield, acceptor_v6_, endpoint_v6); });
|
||||
+ boost::asio::spawn(io_service_, [this, endpoint_v6](boost::asio::yield_context yield) { serve(yield, acceptor_v6_, endpoint_v6); }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
+ );
|
||||
|
||||
boost::asio::ip::tcp::endpoint endpoint_v4(boost::asio::ip::tcp::v4(), port_);
|
||||
- boost::asio::spawn(io_service_, [this, endpoint_v4](boost::asio::yield_context yield) { serve(yield, acceptor_v4_, endpoint_v4); });
|
||||
+ boost::asio::spawn(io_service_, [this, endpoint_v4](boost::asio::yield_context yield) { serve(yield, acceptor_v4_, endpoint_v4); }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
+ );
|
||||
|
||||
handshake_response_ = htonl(42);
|
||||
|
||||
@@ -122,7 +130,11 @@
|
||||
}
|
||||
|
||||
if(accepting_connections()) {
|
||||
- boost::asio::spawn(io_service_, [this, &acceptor, endpoint](boost::asio::yield_context yield) { serve(yield, acceptor, endpoint); });
|
||||
+ boost::asio::spawn(io_service_, [this, &acceptor, endpoint](boost::asio::yield_context yield) { serve(yield, acceptor, endpoint); }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
+ );
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
@@ -567,6 +579,9 @@
|
||||
io_service_, [this, doc_ptr = doc.clone(), socket](boost::asio::yield_context yield) mutable {
|
||||
send_doc_queued(socket, doc_ptr, yield);
|
||||
}
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
);
|
||||
}
|
||||
|
||||
diff -Nur wesnoth-1.18.2-orig/src/server/wesnothd/server.cpp wesnoth-1.18.2/src/server/wesnothd/server.cpp
|
||||
--- wesnoth-1.18.2-orig/src/server/wesnothd/server.cpp 2024-06-29 05:42:43.000000000 +0200
|
||||
+++ wesnoth-1.18.2/src/server/wesnothd/server.cpp 2024-10-01 18:45:42.378324086 +0200
|
||||
@@ -668,12 +668,20 @@
|
||||
|
||||
void server::handle_new_client(socket_ptr socket)
|
||||
{
|
||||
- boost::asio::spawn(io_service_, [socket, this](boost::asio::yield_context yield) { login_client(yield, socket); });
|
||||
+ boost::asio::spawn(io_service_, [socket, this](boost::asio::yield_context yield) { login_client(yield, socket); }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
+ );
|
||||
}
|
||||
|
||||
void server::handle_new_client(tls_socket_ptr socket)
|
||||
{
|
||||
- boost::asio::spawn(io_service_, [socket, this](boost::asio::yield_context yield) { login_client(yield, socket); });
|
||||
+ boost::asio::spawn(io_service_, [socket, this](boost::asio::yield_context yield) { login_client(yield, socket); }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
+ );
|
||||
}
|
||||
|
||||
template<class SocketPtr>
|
||||
@@ -774,6 +782,9 @@
|
||||
default_time_period_,
|
||||
is_moderator
|
||||
}](boost::asio::yield_context yield) { handle_player(yield, socket, new_player); }
|
||||
+#if BOOST_VERSION >= 108000
|
||||
+ , [](std::exception_ptr e) { if (e) std::rethrow_exception(e); }
|
||||
+#endif
|
||||
);
|
||||
|
||||
LOG_SERVER << log_address(socket) << "\t" << username << "\thas logged on"
|
||||
124
wesnoth.changes
124
wesnoth.changes
@@ -1,3 +1,125 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 6 16:41:09 UTC 2026 - Carsten Ziepke <kieltux@gmail.com>
|
||||
|
||||
- Update to 1.18.6:
|
||||
Multiplayer
|
||||
* 5p - The Wilderlands:
|
||||
- Fixed lag during AI turn
|
||||
Translations
|
||||
* Updated translations: Ancient Greek, Arabic, Bengali, British
|
||||
English, Catalan, Chinese (Simplified), Czech, Finnish, French,
|
||||
Galician, Hungarian, Polish, Spanish
|
||||
User interface
|
||||
* The load-game dialog can now see the directories used by the
|
||||
development version (1.19.2 and later)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 2 10:32:20 UTC 2025 - Ana Guerrero <ana.guerrero@suse.com>
|
||||
|
||||
- Remove BuildRequires on libboost_system-devel,
|
||||
removed on boost 1.89 (bsc#1249599)
|
||||
* Patch boost.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 11 06:48:32 UTC 2025 - Carsten Ziepke <kieltux@gmail.com>
|
||||
|
||||
- Update to 1.18.5:
|
||||
Editor
|
||||
* Clear old time-of-day schedule before saving new one, resolves
|
||||
scenario file bloat.
|
||||
Networking
|
||||
* Resolve crash on attempting to download MP replay from
|
||||
server, when using cURL 7.85.0 or later.
|
||||
Terrain
|
||||
* Fix bluff/gulch terrain overlays being conspicuously visible
|
||||
on the minimap display.
|
||||
Translations
|
||||
* Updated translations: Arabic, Bengali, Bulgarian,
|
||||
Chinese (Simplified), Czech, Esperanto, Finnish, Italian,
|
||||
Japanese
|
||||
User interface
|
||||
* Fixed an issue with the Help browser over-scaling portraits
|
||||
up on configurations with a pixel scale higher than 1
|
||||
(e.g. macOS and Retina screens), causing blurry rendering
|
||||
and lacking enough room for text.
|
||||
Miscellaneous and Bug Fixes
|
||||
* Fix failure to build with recent versions of Visual Studio
|
||||
due to missing <chrono> include.
|
||||
* Support compilation with GCC 15.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 22 17:15:23 UTC 2025 - Carsten Ziepke <kieltux@gmail.com>
|
||||
|
||||
- Update to 1.18.4:
|
||||
Campaigns
|
||||
* Eastern Invasion
|
||||
- S04c: achievement now only triggers when escaping with all
|
||||
knights alive
|
||||
- S11/S99: flying units can no longer enter prison cells via
|
||||
the river
|
||||
- S12: fixed Dra-Nak (if present) having incorrect traits
|
||||
and portraits
|
||||
- S17b: AI is now more forced to recruit only higher-level
|
||||
units when gold reserves get too high
|
||||
- S99: prisoners now escape if their jailers are killed
|
||||
Editor
|
||||
* Added Show Tool Information toggle option in the menus and
|
||||
toolbar to allow hiding the informational tooltip on the edge
|
||||
of the screen that shows the current editor tool's usage and
|
||||
palette information
|
||||
Translations
|
||||
* Updated translations: Arabic, Bengali, British English,
|
||||
Chinese (Simplified), Czech, Dutch, Finnish, German,
|
||||
Hungarian, Italian, Norwegian, Spanish, Turkish
|
||||
User interface
|
||||
* Search filter should now be case-insensitive for more than
|
||||
just ASCII characters
|
||||
* Fixed the palette button not being clickable after scrolling
|
||||
in palette widget without moving the cursor
|
||||
WML Engine
|
||||
* Fix crash when weapon specials' filters lead to infinite
|
||||
recursion
|
||||
Miscellaneous and Bug Fixes
|
||||
* Fixed the Load Game dialog forgetting the filename filter when
|
||||
changing directory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 10 06:11:23 UTC 2024 - Carsten Ziepke <kieltux@gmail.com>
|
||||
|
||||
- Update to 1.18.3:
|
||||
Campaigns
|
||||
* Eastern Invasion
|
||||
- S04c: achievement now only triggers when escaping with all
|
||||
knights alive
|
||||
- S11/S99: flying units can no longer enter prison cells
|
||||
via the river
|
||||
- S12: fixed Dra-Nak (if present) having incorrect traits
|
||||
and portraits
|
||||
- S17b: AI is now more forced to recruit only higher-level
|
||||
units when gold reserves get too high
|
||||
- S99: prisoners now escape if their jailers are killed
|
||||
* Under the Burnings Suns
|
||||
- S04: added sprite for the Cold Dagger item (PR #9189)
|
||||
Editor
|
||||
* Added Show Tool Information toggle option in the menus and
|
||||
toolbar to allow hiding the informational tooltip on the edge
|
||||
of the screen that shows the current editor tool's usage and
|
||||
palette information
|
||||
Translations
|
||||
* Updated translations: Arabic, Bengali, British English,
|
||||
Chinese (Simplified), Czech, Finnish, French, German,
|
||||
Hungarian, Italian, Japanese, Turkish, Ukrainian
|
||||
User interface
|
||||
* Help button in the leaderchoosing window works on all
|
||||
languages (issue #9102)
|
||||
WML Engine
|
||||
* Fix crash when weapon specials' filters lead to infinite
|
||||
recursion (issue #8940)
|
||||
Miscellaneous and Bug Fixes
|
||||
* Search filter should now be case-insensitive for more than
|
||||
just ASCII characters (#9328)
|
||||
- Drop wesnoth-fix-building-with-boost-186.patch, fixed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 14 16:09:14 UTC 2024 - Carsten Ziepke <kieltux@gmail.com>
|
||||
|
||||
@@ -1412,7 +1534,7 @@ Mon Jul 19 14:32:03 UTC 2010 - reddwarf@opensuse.org
|
||||
German, Japanese, Slovak, Vietnamese.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 4 11:16:59 IRKST 2010 - highwaystar.ru@gmail.com
|
||||
Fri Jun 4 11:16:59 UTC+9 2010 - highwaystar.ru@gmail.com
|
||||
|
||||
- update to version 1.8.2
|
||||
- bugfix release
|
||||
|
||||
13
wesnoth.spec
13
wesnoth.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package wesnoth
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
%define boost_min_version 1.67
|
||||
Name: wesnoth
|
||||
Version: 1.18.2
|
||||
Version: 1.18.6
|
||||
Release: 0
|
||||
Summary: Fantasy Turn-Based Strategy Game
|
||||
License: EPL-1.0 AND GPL-2.0-or-later
|
||||
@@ -28,8 +28,7 @@ URL: https://www.wesnoth.org/
|
||||
Source: http://files.wesnoth.org/%{name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-OPENSUSE wesnoth-cmake-fix-find-readline.patch - cmake 3.20 (used on leap) can't find readline via pkg_check_modules
|
||||
Patch0: wesnoth-cmake-fix-find-readline.patch
|
||||
# PATCH-FIX-UPSTREAM wesnoth-fix-building-with-boost-186.patch - fix building with boost 1.86 - https://github.com/wesnoth/wesnoth/issues/9284
|
||||
Patch1: wesnoth-fix-building-with-boost-186.patch
|
||||
Patch1: boost.patch
|
||||
BuildRequires: cmake >= 3.14
|
||||
BuildRequires: dejavu
|
||||
BuildRequires: fdupes
|
||||
@@ -62,7 +61,6 @@ BuildRequires: libboost_locale-devel >= %{boost_min_version}
|
||||
BuildRequires: libboost_program_options-devel >= %{boost_min_version}
|
||||
BuildRequires: libboost_random-devel >= %{boost_min_version}
|
||||
BuildRequires: libboost_regex-devel >= %{boost_min_version}
|
||||
BuildRequires: libboost_system-devel >= %{boost_min_version}
|
||||
BuildRequires: libboost_thread-devel >= %{boost_min_version}
|
||||
%endif
|
||||
BuildRequires: libopenssl-3-devel
|
||||
@@ -134,11 +132,10 @@ This package solely contains the basic file structure in order to have it owned
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 1 -p1
|
||||
%if 0%{?sle_version} >= 150500 && 0%{?sle_version} < 160000 && 0%{?is_opensuse}
|
||||
%patch -P 0 -p1
|
||||
%endif
|
||||
# fix building with boost 1.86
|
||||
%patch -P 1 -p1
|
||||
|
||||
# Fix rpmlint's "E: env-script-interpreter".
|
||||
sed -i "s:/usr/bin/env python:/usr/bin/python:g" $(find data/tools -type f)
|
||||
@@ -198,6 +195,8 @@ done
|
||||
%{_bindir}/campaignd
|
||||
|
||||
%files fslayout
|
||||
%dir %{_mandir}/ar
|
||||
%dir %{_mandir}/ar/man6
|
||||
%dir %{_mandir}/bg
|
||||
%dir %{_mandir}/bg/man6
|
||||
%dir %{_mandir}/en_GB
|
||||
|
||||
Reference in New Issue
Block a user