Merge pull request #794 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@019d0cc3f0
freeciv · Dec 15, 2023 · 71989b5 · 71989b5
2 parents 5ea2c72 + 5e75e17
commit 71989b5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 160 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/fc_types.js b/freeciv-web/src/main/webapp/javascript/fc_types.js
@@ -340,7 +340,8 @@ var VUT_ORIGINAL_OWNER = 52;
 var VUT_IMPR_FLAG = 53;
 var VUT_WRAP = 54;
 var VUT_PLAYER_FLAG = 55;
-var VUT_COUNT = 56;             /* Keep this last. */
+var VUT_PLAYER_STATE = 56;
+var VUT_COUNT = 57;             /* Keep this last. */
 
 /* Freeciv's gui_type enum */
 /* GUI_STUB used for options which do not belong to any gui. */

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/?
 #
-# 0020-Player-removal-Clear-city-border-claims.patch
-#   Player removal fix
-#   osdn #48837
 # 0002-Make-playertile-extras-dynamic-bitvector.patch
 #   Memory usage optimization
 #   osdn #48798
@@ -49,7 +46,6 @@ declare -a GIT_PATCHLIST=(
 )
 
 declare -a PATCHLIST=(
-  "backports/0020-Player-removal-Clear-city-border-claims"
   "backports/0002-Make-playertile-extras-dynamic-bitvector"
   "backports/0039-Improve-report.c-coding-style"
   "backports/0002-Pick-random-nations-before-setting-turn-number-to-1"

diff --git a/freeciv/patches/backports/0020-Player-removal-Clear-city-border-claims.patch b/freeciv/patches/backports/0020-Player-removal-Clear-city-border-claims.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=aba0c63eeb1f4eae2bc1f16a693f804200b11e34
+FCREV=019d0cc3f0ebc9864cb0949f14ed85b04b7aa8d4
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Oct.09"