Merge pull request #839 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@16570b44e2
freeciv · May 4, 2024 · c726b3d · c726b3d
2 parents b9dd7c2 + 794df9f
commit c726b3d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 56 deletions.
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -9,9 +9,6 @@
 # 0038-AI-Delay-war-declaration-until-really-revolted.patch
 #   AI senate dismissal fix
 #   osdn #48018
-# 0053-AI-Fix-bad-city-spot-value-calculation-with-unknown-.patch
-#   AI city spot evaluation fix
-#   RM #408
 # 0046-Fix-freeciv-web-build.patch
 #   Freeciv-web build fix
 #   RM #435
@@ -57,7 +54,6 @@ declare -a GIT_PATCHLIST=(
 
 declare -a PATCHLIST=(
   "backports/0038-AI-Delay-war-declaration-until-really-revolted"
-  "backports/0053-AI-Fix-bad-city-spot-value-calculation-with-unknown-"
   "backports/0046-Fix-freeciv-web-build"
   "backports/0034-update_bulbs-Fix-research-researching_saved-research"
   "backports/0050-Initialize-extra-before-calling-unit_assign_specific"

diff --git a/freeciv/patches/backports/0053-AI-Fix-bad-city-spot-value-calculation-with-unknown-.patch b/freeciv/patches/backports/0053-AI-Fix-bad-city-spot-value-calculation-with-unknown-.patch
diff --git a/freeciv/version.txt b/freeciv/version.txt
@@ -1,7 +1,7 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=579ebb52b9ba166efe898cd864f058ab2a1bbcbb
+FCREV=16570b44e264909b17651615ca58d3d9b74f8a64
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.09"