Merge pull request #851 from cazfi/srvup

freeciv · May 27, 2024 · ebf1517 · ebf1517
2 parents 725a876 + 9656238
commit ebf1517
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 68 deletions.
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -9,9 +9,6 @@
 # 0034-update_bulbs-Fix-research-researching_saved-research.patch
 #   Fix to research assert failure
 #   RM #449
-# 0050-Initialize-extra-before-calling-unit_assign_specific.patch
-#   Pillage crash fix
-#   RM #460
 # 0050-savegame-Fix-loading-invalid-resources-on-FoW-map.patch
 #   Savegame resources loading fix
 #   RM #463
@@ -33,7 +30,7 @@
 # 0073-savecompat-Fix-adding-ACTION_NONE-actions-for-units-.patch
 #   Savegame loading fix
 #   RM #577
-# 0077-Meson-Make-pack_client-to-depend-on-verhdr.patch
+# 0089-Meson-Make-fc_client_common-to-depend-on-verhdr.patch
 #   Build fix
 #   RM #596
 # 0080-savegame-Save-ACTION_NONE-as-1.patch
@@ -42,6 +39,9 @@
 # 0068-Meson-Make-libfreeciv-to-depend-on-gitrev.patch
 #   Build fix
 #   RM #597
+# 0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch
+#   City status legality fix
+#   RM #661
 
 # Not in the upstream Freeciv server
 # ----------------------------------
@@ -66,17 +66,17 @@ declare -a GIT_PATCHLIST=(
 
 declare -a PATCHLIST=(
   "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"
   "backports/0054-Fix-inconsistent-city-workers-after-vision-loss"
   "backports/0049-Trigger-action-system-when-client-requests-activity-"
   "backports/0060-Check-C23-nullptr-usability-as-a-sentinel"
   "backports/0048-Handle-CoastStrict-units-correctly-on-city-removal"
   "backports/0061-savegame-Correct-loading-last-turn-change-time"
   "backports/0073-savecompat-Fix-adding-ACTION_NONE-actions-for-units-"
-  "backports/0077-Meson-Make-pack_client-to-depend-on-verhdr"
+  "backports/0089-Meson-Make-fc_client_common-to-depend-on-verhdr"
   "backports/0080-savegame-Save-ACTION_NONE-as-1"
   "backports/0068-Meson-Make-libfreeciv-to-depend-on-gitrev"
+  "backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi"
   "RevertAmplio2ExtraUnits"
   "meson_webperimental"
   "metachange"

diff --git a/freeciv/patches/backports/0050-Initialize-extra-before-calling-unit_assign_specific.patch b/freeciv/patches/backports/0050-Initialize-extra-before-calling-unit_assign_specific.patch
diff --git a/freeciv/patches/backports/0077-Meson-Make-pack_client-to-depend-on-verhdr.patch b/freeciv/patches/backports/0077-Meson-Make-pack_client-to-depend-on-verhdr.patch
diff --git a/freeciv/patches/backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch b/freeciv/patches/backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch
@@ -0,0 +1,32 @@
+From 2af5f7de98ee8d5dcfe9dae9b524ceaa817a79b8 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Wed, 22 May 2024 15:12:31 +0300
+Subject: [PATCH 77/77] city_freeze_workers_queue(): Set needs_arrange for
+ cities already in queue
+
+See RM #661
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+---
+ server/citytools.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/server/citytools.c b/server/citytools.c
+index d9332656e7..b687c07b74 100644
+--- a/server/citytools.c
++++ b/server/citytools.c
+@@ -162,6 +162,11 @@ void city_freeze_workers_queue(struct city *pcity)
+   if (arrange_workers_queue == nullptr) {
+     arrange_workers_queue = city_list_new();
+   } else if (city_list_find_number(arrange_workers_queue, pcity->id)) {
++    /* City might have been arranged since it was originally put to the queue.
++     * Make sure needs_arrange is set again. */
++    if (pcity->server.needs_arrange == CNA_NOT) {
++      pcity->server.needs_arrange = CNA_NORMAL;
++    }
+     return;
+   }
+
+-- 
+2.43.0
+
diff --git a/freeciv/patches/backports/0089-Meson-Make-fc_client_common-to-depend-on-verhdr.patch b/freeciv/patches/backports/0089-Meson-Make-fc_client_common-to-depend-on-verhdr.patch
@@ -0,0 +1,28 @@
+From 79e30f320d9f8f299e47014b37d517fd063688c0 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Tue, 21 May 2024 09:50:07 +0300
+Subject: [PATCH 89/92] Meson: Make fc_client_common to depend on verhdr
+
+See RM #596
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index cd05e91f2e..0d6b15bead 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2169,7 +2169,7 @@ client_common = static_library('fc_client_common',
+   'client/update_queue.c',
+   'client/voteinfo.c',
+   'client/zoom.c',
+-  sources: [audio_sdl_src, pack_client,
++  sources: [verhdr, audio_sdl_src, pack_client,
+             tolua.process('client/luascript/tolua_client.pkg')],
+   include_directories: client_inc,
+   link_with: [common_lib],
+-- 
+2.43.0
+
diff --git a/freeciv/version.txt b/freeciv/version.txt
@@ -1,7 +1,7 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=6fd1b3cd58e4822acb2808e59bf5462f8c0f8e96
+FCREV=fa39b51180ae53a41309f231ba4556d1c46f3678
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.23b"