Merge pull request #791 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@d82ac9b167
freeciv · Dec 9, 2023 · 88a2101 · 88a2101
2 parents 55d2435 + 3cc4913
commit 88a2101
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 51 deletions.
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -9,9 +9,6 @@
 # 0025-Autoworkers-Use-ADV_WANTS_EQ-for-comparing-tile-valu.patch
 #   Autoworkers work value fix
 #   osdn #48842
-# 0032-mapimg_help-Fix-format-overflow-warning.patch
-#   gcc-14 warning fix
-#   osdn #48850
 # 0029-Fix-dbv_copy.patch
 #   Memory handling fix
 #   osdn #48869
@@ -56,7 +53,6 @@ declare -a GIT_PATCHLIST=(
 
 declare -a PATCHLIST=(
   "backports/0025-Autoworkers-Use-ADV_WANTS_EQ-for-comparing-tile-valu"
-  "backports/0032-mapimg_help-Fix-format-overflow-warning"
   "backports/0029-Fix-dbv_copy"
   "backports/0020-Player-removal-Clear-city-border-claims"
   "backports/0002-Make-playertile-extras-dynamic-bitvector"

diff --git a/freeciv/patches/backports/0032-mapimg_help-Fix-format-overflow-warning.patch b/freeciv/patches/backports/0032-mapimg_help-Fix-format-overflow-warning.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=5187ac0f78bfdd4ffcbff3bd40a130e1d70dde78
+FCREV=d82ac9b167b6303727a0f444c75acd9d35439a68
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Oct.09"