Skip to content

v0.47.05: Fix errors from newer versions of CMake and GCC #5893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cizra wants to merge 4 commits into
base: v0.47.05
Choose a base branch
from
+12 −6
Open

v0.47.05: Fix errors from newer versions of CMake and GCC #5893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba1ef61
Update minimum CMake version, fixes build with CMake 4
cizra Sep 3, 2026
58c8297
Fix warning (fixes build due to warnings-as-errors)
cizra Sep 3, 2026
64eb55f
Bump the version to 0.47.05-r9
cizra Sep 3, 2026
d461b7f
Fix PR validation builds
cizra Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .readthedocs.requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
sphinx==4.4.0
2 changes: 1 addition & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
version: 2

build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3"

Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ endif()

# set up versioning.
set(DF_VERSION "0.47.05")
set(DFHACK_RELEASE "r8")
set(DFHACK_RELEASE "r9")
set(DFHACK_PRERELEASE FALSE)

set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
Expand Down Expand Up @@ -419,6 +419,9 @@ include_directories(depends/tthread)
include_directories(${ZLIB_INCLUDE_DIRS})
include_directories(depends/clsocket/src)
include_directories(depends/xlsxio/include)
# CMake 4 removed support for policy versions older than 3.5. Keep the
# bundled third-party projects buildable without modifying their submodules.
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
add_subdirectory(depends)

# Testing with CTest
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Removed
- ``fix-job-postings`` from the `workflow` plugin is now obsolete since affected savegames can no longer be loaded

# 0.47.05-r9

## Internals
- Fixed building with newer versions of CMake and GCC

# 0.47.05-r8

## New Plugins
Expand Down
3 changes: 0 additions & 3 deletions plugins/remotefortressreader/remotefortressreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,9 +1693,6 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques
continue;
}

using df::global::cur_year;
using df::global::cur_year_tick;

send_unit->set_age(Units::getAge(unit, false));

ConvertDfColor(Units::getProfessionColor(unit), send_unit->mutable_profession_color());
Expand Down
2 changes: 2 additions & 0 deletions plugins/search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,8 @@ class pets_search : public pets_search_base
return get_unit_description(element.unit);
}

using pets_search_base::should_check_input;

bool should_check_input()
{
return viewscreen->mode == T_mode::List;
Expand Down