Merge pull request #771 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@9e27cb002b
freeciv · Oct 31, 2023 · 937fca3 · 937fca3
2 parents d5bb8cd + 13d32df
commit 937fca3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 81 deletions.
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -8,9 +8,6 @@
 # 0047-Meson-Turn-audio-option-to-a-combo.patch
 #   Rework disabling audio
 #   osdn #48757
-# 0008-Add-new-bitvector-utility-functions.patch
-#   New bitvector utility functions
-#   osdn #48731
 # 0047-Add-bv_match_dbv-utility-function.patch
 #   New bitvector utility function
 #   osdn #48771
@@ -64,7 +61,6 @@ declare -a GIT_PATCHLIST=(
 
 declare -a PATCHLIST=(
   "backports/0047-Meson-Turn-audio-option-to-a-combo"
-  "backports/0008-Add-new-bitvector-utility-functions"
   "backports/0047-Add-bv_match_dbv-utility-function"
   "backports/0057-Fix-bitvector-copy-functions"
   "backports/0064-featured_text.-ch-Replace-NULL-with-nullptr"

diff --git a/freeciv/patches/backports/0008-Add-new-bitvector-utility-functions.patch b/freeciv/patches/backports/0008-Add-new-bitvector-utility-functions.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=07e0980aea48cf764723b620d1fb845cf73050d7
+FCREV=9e27cb002b44324a1699ffef2f6caae9e74b216a
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Sep.27"