Skip to content

Commit

Permalink
Merge pull request #832 from cazfi/srvup
Browse files Browse the repository at this point in the history
Update to Freeciv server freeciv/freeciv@d30edc5109
  • Loading branch information
cazfi authored Apr 15, 2024
2 parents d6d511b + 308019f commit 0a07597
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 206 deletions.
12 changes: 0 additions & 12 deletions freeciv/apply_patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@
# https://osdn.net/projects/freeciv/ticket/?????
# https://redmine.freeciv.org/issues/???
#
# 0023-Fix-activity2char-assert-failure.patch
# Savegame loading fix
# RM #305
# 0025-Purge-worklist-items-with-unfulfilled-local-range-im.patch
# Worklist handling fix
# osdn #48773
# 0002-Fix-allied-victory-of-all-players.patch
# Victory conditions fix
# RM #324
# 0041-Stop-sending-hidden-resources-to-the-client.patch
# Extra visibility fix
# RM #350
Expand Down Expand Up @@ -50,9 +41,6 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0023-Fix-activity2char-assert-failure"
"backports/0025-Purge-worklist-items-with-unfulfilled-local-range-im"
"backports/0002-Fix-allied-victory-of-all-players"
"backports/0041-Stop-sending-hidden-resources-to-the-client"
"backports/0051-Adjust-nationality-of-remaining-units-after-player-r"
"backports/0038-AI-Delay-war-declaration-until-really-revolted"
Expand Down
109 changes: 0 additions & 109 deletions freeciv/patches/backports/0002-Fix-allied-victory-of-all-players.patch

This file was deleted.

This file was deleted.

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=5d3d7f1af11bb6703784b957447017507df82774
FCREV=d30edc5109a4394a1eb6ed14906dff191d1efc38

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Mar.08"
ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Mar.22"

# 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 0a07597

Please sign in to comment.