Merge pull request #853 from cazfi/srvup

freeciv/apply_patches.sh

@@ -9,15 +9,9 @@
 # 0050-savegame-Fix-loading-invalid-resources-on-FoW-map.patch
 #   Savegame resources loading fix
 #   RM #463
-# 0054-Fix-inconsistent-city-workers-after-vision-loss.patch
-#   Fix to inconsistent city state
-#   RM #472
 # 0049-Trigger-action-system-when-client-requests-activity-.patch
 #   Activity action fix (esp. Pillage)
 #   osdn #57670
-# 0060-Check-C23-nullptr-usability-as-a-sentinel.patch
-#   C23 compile fix
-#   RM #475
 # 0048-Handle-CoastStrict-units-correctly-on-city-removal.patch
 #   Fix to unit placement after city destruction
 #   RM #525
@@ -36,6 +30,9 @@
 # 0068-Meson-Make-libfreeciv-to-depend-on-gitrev.patch
 #   Build fix
 #   RM #597
+# 0074-Meson-Make-fc_server-to-depend-on-verhdr.patch
+#   Build fix
+#   RM #682
 # 0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch
 #   City status legality fix
 #   RM #661
@@ -63,15 +60,14 @@ declare -a GIT_PATCHLIST=(
 
 declare -a PATCHLIST=(
   "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/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/0074-Meson-Make-fc_server-to-depend-on-verhdr"
   "backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi"
   "RevertAmplio2ExtraUnits"
   "meson_webperimental"

freeciv/patches/backports/0074-Meson-Make-fc_server-to-depend-on-verhdr.patch

@@ -0,0 +1,28 @@
+From 6228415a558a8adf6f715abe2d91ed2fd145b79a Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <[email protected]>
+Date: Tue, 28 May 2024 00:11:05 +0300
+Subject: [PATCH 74/74] Meson: Make fc_server to depend on verhdr
+
+See RM #682
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5938236ee7..7a3f0288e8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1503,7 +1503,7 @@ server_lib = static_library('fc_server',
+   'server/unittools.c',
+   'server/voting.c',
+   include_directories: server_inc,
+-  sources: [ pack_server,
++  sources: [ verhdr, pack_server,
+              tolua.process('server/scripting/tolua_fcdb.pkg',
+                            'server/scripting/tolua_server.pkg')],
+   dependencies: lua_dep
+-- 
+2.43.0
+

freeciv/version.txt

@@ -1,9 +1,9 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=861a93b2a4909d0e134b7112ac33fab82d0be9e5
+FCREV=3c41f4e1ac25fe1ff8b383740ebabfe044907c0b
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.23b"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.30"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are

scripts/generate_js_hand/generate_packets.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: latin-1 -*-
-
 #
 # Freeciv - Copyright (C) 2003 - Raimar Falke
 #   This program is free software; you can redistribute it and/or modify
@@ -532,7 +531,7 @@ def __init__(self,poscaps,negcaps,name,fields,packet,no):
         self.type=packet.type
         self.delta=packet.delta
         self.is_info=packet.is_info
-        self.cancel=packet.cancel
+        self.reset=packet.reset
         self.want_force=packet.want_force
 
         self.poscaps=poscaps
@@ -825,8 +824,8 @@ def get_delta_send_body(self):
   hash_insert(*hash, clone, clone);
 '''
 
-        # Cancel some is-info packets.
-        for i in self.cancel:
+        # Reset some is-info packets.
+        for i in self.reset:
             body=body+'''
   hash = &pc->phs.sent[%s];
   if (NULL != *hash) {
@@ -1005,12 +1004,12 @@ def __init__(self,str, types):
         self.want_force="force" in arr
         if self.want_force: arr.remove("force")
 
-        self.cancel=[]
+        self.reset=[]
         remaining=[]
         for i in arr:
-            mo=re.search("^cancel\((.*)\)$",i)
+            mo=re.search("^reset\((.*)\)$",i)
             if mo:
-                self.cancel.append(mo.group(1))
+                self.reset.append(mo.group(1))
                 continue
             remaining.append(i)
         arr=remaining