Merge pull request #806 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@60f97bc1ba
freeciv · Feb 3, 2024 · 0c9f00a · 0c9f00a
2 parents 2564c51 + a73c0b0
commit 0c9f00a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 36 deletions.
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -6,9 +6,6 @@
 # https://osdn.net/projects/freeciv/ticket/?????
 # https://redmine.freeciv.org/issues/???
 #
-# 0004-Fix-bombard-rate-always-being-1.patch
-#   Bombard action fix
-#   RM #93
 # 0026-savecompat-Add-wlcb-for-all-cities.patch
 #   Savegame loading fix
 #   RM #143
@@ -34,7 +31,6 @@ declare -a GIT_PATCHLIST=(
 )
 
 declare -a PATCHLIST=(
-  "backports/0004-Fix-bombard-rate-always-being-1"
   "backports/0026-savecompat-Add-wlcb-for-all-cities"
   "meson_webperimental"
   "metachange"

diff --git a/freeciv/patches/backports/0004-Fix-bombard-rate-always-being-1.patch b/freeciv/patches/backports/0004-Fix-bombard-rate-always-being-1.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=0008ac2117e05bdf093c234734c64ef35eec6630
+FCREV=60f97bc1ba3453f4547c3293d80805a5fefb8326
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Dec.27"