From f8cdea30b48d47c507b475c1a8bb17cfcbfe2eba Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 11 May 2026 05:28:04 +0000 Subject: [PATCH] colobot: fix build with Boost 1.91: drop boost::system requirement regen patch while there --- games/colobot/colobot/patches/patch-CMakeLists_txt | 9 +++++++++ games/colobot/colobot/patches/patch-src_app_main_cpp | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/games/colobot/colobot/patches/patch-CMakeLists_txt b/games/colobot/colobot/patches/patch-CMakeLists_txt index cd63cb91891..32f3e4f8c92 100644 --- a/games/colobot/colobot/patches/patch-CMakeLists_txt +++ b/games/colobot/colobot/patches/patch-CMakeLists_txt @@ -17,3 +17,12 @@ Index: CMakeLists.txt set(DEBUG_CXX_FLAGS "-g -O0") set(TEST_CXX_FLAGS "-pthread") add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE) +@@ -321,7 +319,7 @@ set(Boost_USE_MULTITHREADED ON) + set(Boost_USE_STATIC_RUNTIME ${USE_STATIC_RUNTIME}) + + set(Boost_ADDITIONALVERSION "1.51" "1.51.0") +-find_package(Boost COMPONENTS system filesystem regex REQUIRED) ++find_package(Boost COMPONENTS filesystem regex REQUIRED) + + set(GLEW_USE_STATIC_LIBS ${GLEW_STATIC}) + find_package(GLEW REQUIRED) diff --git a/games/colobot/colobot/patches/patch-src_app_main_cpp b/games/colobot/colobot/patches/patch-src_app_main_cpp index 41bfa9c7f8d..35125234b1a 100644 --- a/games/colobot/colobot/patches/patch-src_app_main_cpp +++ b/games/colobot/colobot/patches/patch-src_app_main_cpp @@ -10,7 +10,7 @@ if the main -> SDL_main macro is in use. Index: src/app/main.cpp --- src/app/main.cpp.orig +++ src/app/main.cpp -@@ -94,10 +94,14 @@ The current layout is the following: +@@ -101,10 +101,14 @@ The current layout is the following: - src/script - link with the CBot library */ @@ -26,7 +26,7 @@ Index: src/app/main.cpp int main(int argc, char *argv[]) { CLogger logger; // single instance of logger -@@ -176,4 +180,6 @@ int main(int argc, char *argv[]) +@@ -203,4 +207,6 @@ int main(int argc, char *argv[]) return code; }