Skip to content

Commit

Permalink
Merge pull request #800 from cazfi/srvup
Browse files Browse the repository at this point in the history
Update to Freeciv server freeciv/freeciv@4e9292e4a5
  • Loading branch information
cazfi authored Jan 3, 2024
2 parents 0943677 + a498ad6 commit d3a177a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 38 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/??
#
# 0029-Meson-Search-mwand-by-MagickWand-6.Q16HDRI.pc.patch
# MagickWand configure time fix on latest Debian/Ubuntu
# RM #32
# 0027-worklist_item_postpone_req_vec-Add-break-for-VUT_PLA.patch
# Build target postponing fix
# RM #72
Expand Down Expand Up @@ -46,7 +43,6 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0029-Meson-Search-mwand-by-MagickWand-6.Q16HDRI.pc"
"backports/0027-worklist_item_postpone_req_vec-Add-break-for-VUT_PLA"
"backports/0029-universal_value_initial-Fix-switch-case-fall-through"
"backports/0031-Meson-Enable-implicit-fallthrough-compiler-warnings"
Expand Down

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=e8beaa91d5b6116dc59ce1c1dc4ded6bc6f64066
FCREV=4e9292e4a52c257d0b02f667614609cb31a686ab

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Nov.10"
ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Dec.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 d3a177a

Please sign in to comment.