Skip to content

Commit

Permalink
Merge pull request #805 from cazfi/srvup
Browse files Browse the repository at this point in the history
Update to Freeciv server freeciv/freeciv@0008ac2117
  • Loading branch information
cazfi authored Jan 18, 2024
2 parents 6ccc588 + f775fa8 commit 2564c51
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 297 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/???
#
# 0031-Meson-Enable-implicit-fallthrough-compiler-warnings.patch
# Stricter compiler warnings
# RM #76
# 0014-Improve-savemain.c-coding-style.patch
# Baseline for freeciv-web patches
# RM #79
# 0017-Fix-city-removal-server-crashes.patch
# Crash fix
# RM #81
# 0004-Fix-bombard-rate-always-being-1.patch
# Bombard action fix
# RM #93
Expand Down Expand Up @@ -43,9 +34,6 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0031-Meson-Enable-implicit-fallthrough-compiler-warnings"
"backports/0014-Improve-savemain.c-coding-style"
"backports/0017-Fix-city-removal-server-crashes"
"backports/0004-Fix-bombard-rate-always-being-1"
"backports/0026-savecompat-Add-wlcb-for-all-cities"
"meson_webperimental"
Expand Down
199 changes: 0 additions & 199 deletions freeciv/patches/backports/0014-Improve-savemain.c-coding-style.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=f2716da03b873e7da8f12a2abf4928f92dd04272
FCREV=0008ac2117e05bdf093c234734c64ef35eec6630

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Dec.04"
ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Dec.27"

# 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 2564c51

Please sign in to comment.