millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-08 00:05:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

games-strategy/s25rttr: fix build w/ boost-1.89

Browse Source 
* Fix build w/ boost-1.89 (bug #963310)
* noreturn warning fix while at it

Closes: https://bugs.gentoo.org/963310
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2025-11-06 17:29:56 +00:00
parent 2adca052d0
commit 43d08015d5
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
3 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
games-strategy/s25rttr/files/s25rttr-0.9.5-boost-1.89.patch Normal file
View File

@ -0,0 +1,58 @@
https://github.com/Return-To-The-Roots/libsiedler2/compare/a2b0374f5d956080329acd2bcdd73beaf5f6b687...8a2a7e274725c97e797b00ab64b4152a6a18fdc6
https://bugs.gentoo.org/963310
From 8a2a7e274725c97e797b00ab64b4152a6a18fdc6 Mon Sep 17 00:00:00 2001
From: Alexander Grund <Flamefire@users.noreply.github.com>
Date: Thu, 18 Sep 2025 16:37:35 +0200
Subject: [PATCH] Remove "system" component from Boost find_package search
Boost.System is header-only so this is not required and fails with Boost 1.89
---
CMakeLists.txt | 2 +-
examples/chTransparentIdx/CMakeLists.txt | 4 ++--
examples/lstpacker/CMakeLists.txt | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/external/libsiedler2/CMakeLists.txt b/external/libsiedler2/CMakeLists.txt
index 6cc0322..6d78db4 100644
--- a/external/libsiedler2/CMakeLists.txt
+++ b/external/libsiedler2/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
include(RttrBoostCfg)
-find_package(Boost 1.69 REQUIRED COMPONENTS system filesystem iostreams)
+find_package(Boost 1.69 REQUIRED COMPONENTS filesystem iostreams)
include(RttrTestingCfg)
if(isTopLevel)
diff --git a/external/libsiedler2/examples/chTransparentIdx/CMakeLists.txt b/external/libsiedler2/examples/chTransparentIdx/CMakeLists.txt
index a5a03b2..80ace6c 100644
--- a/external/libsiedler2/examples/chTransparentIdx/CMakeLists.txt
+++ b/external/libsiedler2/examples/chTransparentIdx/CMakeLists.txt
@@ -1,8 +1,8 @@
-# Copyright (C) 2005 - 2021 Settlers Freaks <sf-team at siedler25.org>
+# Copyright (C) 2005 - 2025 Settlers Freaks <sf-team at siedler25.org>
#
# SPDX-License-Identifier: GPL-2.0-or-later
-find_package(Boost 1.69 REQUIRED COMPONENTS system program_options)
+find_package(Boost 1.69 REQUIRED COMPONENTS program_options)
add_executable(chTransparentIdx chTransparentIdx.cpp)
diff --git a/external/libsiedler2/examples/lstpacker/CMakeLists.txt b/external/libsiedler2/examples/lstpacker/CMakeLists.txt
index 95b10e4..0b66ea7 100644
--- a/external/libsiedler2/examples/lstpacker/CMakeLists.txt
+++ b/external/libsiedler2/examples/lstpacker/CMakeLists.txt
@@ -1,8 +1,8 @@
-# Copyright (C) 2005 - 2021 Settlers Freaks <sf-team at siedler25.org>
+# Copyright (C) 2005 - 2025 Settlers Freaks <sf-team at siedler25.org>
#
# SPDX-License-Identifier: GPL-2.0-or-later
-find_package(Boost 1.69 REQUIRED COMPONENTS system program_options)
+find_package(Boost 1.69 REQUIRED COMPONENTS program_options)
file(GLOB _sources *.cpp *.h)
add_executable(lstpacker ${_sources})

33
games-strategy/s25rttr/files/s25rttr-0.9.5-noreturn.patch Normal file
View File

@ -0,0 +1,33 @@
https://github.com/Return-To-The-Roots/s25client/issues/1812
From 7198609c21eae58c31cee5e88c76dc3eddea603f Mon Sep 17 00:00:00 2001
From: Alexander Grund <Flamefire@users.noreply.github.com>
Date: Sun, 26 Oct 2025 18:11:57 +0100
Subject: [PATCH] Add noreturn attributes to Singleton policies
---
external/libutil/libs/common/include/s25util/SingletonPolicies.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/external/libutil/libs/common/include/s25util/SingletonPolicies.h b/external/libutil/libs/common/include/s25util/SingletonPolicies.h
index fa2f40b..5ff9e2f 100644
--- a/external/libutil/libs/common/include/s25util/SingletonPolicies.h
+++ b/external/libutil/libs/common/include/s25util/SingletonPolicies.h
@@ -16,7 +16,7 @@ using DestructionFunPtr = void (*)();
template<typename T>
struct DefaultLifetime
{
- static void OnDeadReference() { throw std::runtime_error("Access to dead singleton detected!"); }
+ [[noreturn]] static void OnDeadReference() { throw std::runtime_error("Access to dead singleton detected!"); }
static void ScheduleDestruction(T*, DestructionFunPtr pFun) { std::atexit(pFun); }
};
@@ -55,7 +55,7 @@ unsigned GetLongevity(T*)
template<typename T>
struct WithLongevity
{
- static void OnDeadReference() { throw std::runtime_error("Access to dead singleton detected!"); }
+ [[noreturn]] static void OnDeadReference() { throw std::runtime_error("Access to dead singleton detected!"); }
static void ScheduleDestruction(T* inst, DestructionFunPtr pFun) { SetLongevity(GetLongevity(inst), pFun); }
};

2
games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
View File

@ -47,6 +47,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.9.5-boost.patch
"${FILESDIR}"/${PN}-0.9.5-miniupnpc.patch
"${FILESDIR}"/${PN}-0.9.5-gcc15.patch
"${FILESDIR}"/${PN}-0.9.5-boost-1.89.patch
"${FILESDIR}"/${PN}-0.9.5-noreturn.patch
)
# Build type is checked but blank is valid.