Skip to content

Commit

Permalink
Merge pull request #870 from cazfi/srvup
Browse files Browse the repository at this point in the history
Update to Freeciv server freeciv/freeciv@86394b498f
  • Loading branch information
cazfi authored Nov 2, 2024
2 parents 9be1341 + 27d4065 commit dc1895b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 119 deletions.
4 changes: 0 additions & 4 deletions freeciv/apply_patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
# https://osdn.net/projects/freeciv/ticket/?????
# https://redmine.freeciv.org/issues/???
#
# 0080-savegame-Save-ACTION_NONE-as-1.patch
# Savegame loading fix
# RM #598
# 0074-Meson-Make-fc_server-to-depend-on-verhdr.patch
# Build fix
# RM #682
Expand Down Expand Up @@ -47,7 +44,6 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0080-savegame-Save-ACTION_NONE-as-1"
"backports/0074-Meson-Make-fc_server-to-depend-on-verhdr"
"backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi"
"backports/0068-AI-Remove-shared-vision-from-pending-war-target-once"
Expand Down
113 changes: 0 additions & 113 deletions freeciv/patches/backports/0080-savegame-Save-ACTION_NONE-as-1.patch

This file was deleted.

4 changes: 2 additions & 2 deletions freeciv/version.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# The Git SHA hash for the commit to checkout from
# https://github.com/freeciv/freeciv

FCREV=2fd8569abbc9455f0e5bafb11412734b0b0f250b
FCREV=86394b498f81c04248b1c08225033f329a6593e5

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.May.26"
ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.June.04"

# There's no need to bump this constantly as current freeciv-web
# makes no connections to outside world - all connections are
Expand Down

0 comments on commit dc1895b

Please sign in to comment.