From ba1ef61365eef7b7fa9c0ae008258821e5d2d556 Mon Sep 17 00:00:00 2001
From: Elmo Todurov <elmo_git@todurov.eu>
Date: Fri, 4 Sep 2026 01:45:06 +0300
Subject: [PATCH 1/4] Update minimum CMake version, fixes build with CMake 4

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b435a8292..2762bc9972 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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

From 58c829716be9cdc80f0da6dd1340411bfa19a488 Mon Sep 17 00:00:00 2001
From: Elmo Todurov <elmo_git@todurov.eu>
Date: Fri, 4 Sep 2026 02:26:09 +0300
Subject: [PATCH 2/4] Fix warning (fixes build due to warnings-as-errors)

---
 plugins/remotefortressreader/remotefortressreader.cpp | 3 ---
 plugins/search.cpp                                    | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 643e92b210..4ee0c36d61 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -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());
diff --git a/plugins/search.cpp b/plugins/search.cpp
index 9ecae6460b..2990aba3b6 100644
--- a/plugins/search.cpp
+++ b/plugins/search.cpp
@@ -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;

From 64eb55f7ecb6a527992a31a2f09d4482320c4f5c Mon Sep 17 00:00:00 2001
From: Elmo Todurov <elmo_git@todurov.eu>
Date: Fri, 4 Sep 2026 02:26:09 +0300
Subject: [PATCH 3/4] Bump the version to 0.47.05-r9

---
 CMakeLists.txt     | 2 +-
 docs/changelog.txt | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2762bc9972..2e0ab8b156 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2c000262be..c8472e03df 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -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

From d461b7f4bf4a5b300dfa8fc1ec3e3ff05be5d912 Mon Sep 17 00:00:00 2001
From: Elmo Todurov <elmo_git@todurov.eu>
Date: Fri, 4 Sep 2026 02:26:09 +0300
Subject: [PATCH 4/4] Fix PR validation builds

---
 .readthedocs.requirements.txt | 1 -
 .readthedocs.yml              | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.readthedocs.requirements.txt b/.readthedocs.requirements.txt
index 1f028de414..e69de29bb2 100644
--- a/.readthedocs.requirements.txt
+++ b/.readthedocs.requirements.txt
@@ -1 +0,0 @@
-sphinx==4.4.0
diff --git a/.readthedocs.yml b/.readthedocs.yml
index e66d3da1b1..bf71c46b78 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -5,7 +5,7 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   tools:
     python: "3"