Merge pull request #837 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@579ebb52b9
freeciv · May 1, 2024 · 32390fd · 32390fd
2 parents 0a59e87 + 957b1f9
commit 32390fd
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 62 deletions.
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -6,15 +6,15 @@
 # https://osdn.net/projects/freeciv/ticket/?????
 # https://redmine.freeciv.org/issues/???
 #
-# 0051-Adjust-nationality-of-remaining-units-after-player-r.patch
-#   Fix to player removal
-#   RM #383
 # 0038-AI-Delay-war-declaration-until-really-revolted.patch
 #   AI senate dismissal fix
 #   osdn #48018
 # 0053-AI-Fix-bad-city-spot-value-calculation-with-unknown-.patch
 #   AI city spot evaluation fix
 #   RM #408
+# 0046-Fix-freeciv-web-build.patch
+#   Freeciv-web build fix
+#   RM #435
 # 0034-update_bulbs-Fix-research-researching_saved-research.patch
 #   Fix to research assert failure
 #   RM #449
@@ -56,9 +56,9 @@ declare -a GIT_PATCHLIST=(
 )
 
 declare -a PATCHLIST=(
-  "backports/0051-Adjust-nationality-of-remaining-units-after-player-r"
   "backports/0038-AI-Delay-war-declaration-until-really-revolted"
   "backports/0053-AI-Fix-bad-city-spot-value-calculation-with-unknown-"
+  "backports/0046-Fix-freeciv-web-build"
   "backports/0034-update_bulbs-Fix-research-researching_saved-research"
   "backports/0050-Initialize-extra-before-calling-unit_assign_specific"
   "backports/0050-savegame-Fix-loading-invalid-resources-on-FoW-map"

diff --git a/freeciv/patches/backports/0046-Fix-freeciv-web-build.patch b/freeciv/patches/backports/0046-Fix-freeciv-web-build.patch
@@ -0,0 +1,36 @@
+From 08477c234f5f05120116a3901ea87964368b62b3 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <[email protected]>
+Date: Wed, 10 Apr 2024 03:29:33 +0300
+Subject: [PATCH 46/47] Fix freeciv-web build
+
+See RM #435
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+---
+ server/citytools.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/server/citytools.c b/server/citytools.c
+index 03430daa79..24fc2bad71 100644
+--- a/server/citytools.c
++++ b/server/citytools.c
+@@ -2689,6 +2689,7 @@ void package_city(struct city *pcity, struct packet_city_info *packet,
+ #ifdef FREECIV_WEB
+   if (web_packet != nullptr) {
+     struct tile *pcenter = city_tile(pcity);
++    const struct civ_map *nmap = &(wld.map);
+
+     BV_CLR_ALL(web_packet->can_build_unit);
+     BV_CLR_ALL(web_packet->can_build_improvement);
+@@ -2719,7 +2720,7 @@ void package_city(struct city *pcity, struct packet_city_info *packet,
+     } unit_type_iterate_end;
+
+     i = 0;
+-    city_tile_iterate(city_map_radius_sq_get(pcity), pcenter, ptile) {
++    city_tile_iterate(nmap, city_map_radius_sq_get(pcity), pcenter, ptile) {
+       web_packet->output_food[i] = city_tile_output_now(pcity, ptile, O_FOOD);
+       web_packet->output_shield[i] = city_tile_output_now(pcity, ptile, O_SHIELD);
+       web_packet->output_trade[i] = city_tile_output_now(pcity, ptile, O_TRADE);
+-- 
+2.43.0
+
diff --git a/freeciv/patches/backports/0051-Adjust-nationality-of-remaining-units-after-player-r.patch b/freeciv/patches/backports/0051-Adjust-nationality-of-remaining-units-after-player-r.patch
diff --git a/freeciv/version.txt b/freeciv/version.txt
@@ -1,9 +1,9 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=df12a279ddc417a964a8a9da0c4fc373a1981ca7
+FCREV=579ebb52b9ba166efe898cd864f058ab2a1bbcbb
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.07"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.09"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are