Merge pull request #852 from cazfi/srvup

freeciv · May 30, 2024 · 1cc197e · 1cc197e
2 parents ebf1517 + 7d42983
commit 1cc197e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 48 deletions.
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -6,9 +6,6 @@
 # https://osdn.net/projects/freeciv/ticket/?????
 # https://redmine.freeciv.org/issues/???
 #
-# 0034-update_bulbs-Fix-research-researching_saved-research.patch
-#   Fix to research assert failure
-#   RM #449
 # 0050-savegame-Fix-loading-invalid-resources-on-FoW-map.patch
 #   Savegame resources loading fix
 #   RM #463
@@ -65,7 +62,6 @@ declare -a GIT_PATCHLIST=(
 )
 
 declare -a PATCHLIST=(
-  "backports/0034-update_bulbs-Fix-research-researching_saved-research"
   "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-"

diff --git a/freeciv/patches/backports/0034-update_bulbs-Fix-research-researching_saved-research.patch b/freeciv/patches/backports/0034-update_bulbs-Fix-research-researching_saved-research.patch
diff --git a/freeciv/patches/goto_fcweb.patch b/freeciv/patches/goto_fcweb.patch
@@ -1,7 +1,7 @@
 diff -Nurd freeciv/common/networking/packets.def freeciv/common/networking/packets.def
---- freeciv/common/networking/packets.def	2023-11-27 01:51:06.516677533 +0200
-+++ freeciv/common/networking/packets.def	2023-11-27 01:51:18.284703422 +0200
-@@ -2447,3 +2447,17 @@
+--- freeciv/common/networking/packets.def	2024-05-24 15:18:27.806894723 +0300
++++ freeciv/common/networking/packets.def	2024-05-24 15:18:38.423009171 +0300
+@@ -2454,3 +2454,17 @@
 
    BV_ACTIONS utype_actions;
  end
@@ -20,8 +20,8 @@ diff -Nurd freeciv/common/networking/packets.def freeciv/common/networking/packe
 +  UINT32 turns;
 +end
 diff -Nurd freeciv/server/unithand.c freeciv/server/unithand.c
---- freeciv/server/unithand.c	2023-11-27 01:51:06.908678396 +0200
-+++ freeciv/server/unithand.c	2023-11-27 01:51:18.288703431 +0200
+--- freeciv/server/unithand.c	2024-05-24 15:18:28.386900976 +0300
++++ freeciv/server/unithand.c	2024-05-24 15:18:38.427009214 +0300
 @@ -48,6 +48,9 @@
  #include "unit.h"
  #include "unitlist.h"
@@ -32,7 +32,7 @@ diff -Nurd freeciv/server/unithand.c freeciv/server/unithand.c
  /* common/scriptcore */
  #include "luascript_types.h"
 
-@@ -4253,6 +4256,84 @@
+@@ -4272,6 +4275,84 @@
  }
 
  /**********************************************************************//**

diff --git a/freeciv/patches/webgl_vision_cheat_temporary.patch b/freeciv/patches/webgl_vision_cheat_temporary.patch
@@ -1,7 +1,7 @@
 diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
---- freeciv/server/maphand.c	2024-03-17 11:41:42.049729184 +0200
-+++ freeciv/server/maphand.c	2024-03-17 11:41:51.409766779 +0200
-@@ -461,7 +461,7 @@
+--- freeciv/server/maphand.c	2024-05-24 15:42:36.510417770 +0300
++++ freeciv/server/maphand.c	2024-05-24 15:42:50.142582021 +0300
+@@ -464,7 +464,7 @@
        conn_list_do_buffer(dest);
      }
 
@@ -10,7 +10,7 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
    } whole_map_iterate_end;
 
    conn_list_do_unbuffer(dest);
-@@ -603,20 +603,32 @@
+@@ -615,20 +615,32 @@
        info.altitude = ptile->altitude;
 
        send_packet_tile_info(pconn, &info);

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=fa39b51180ae53a41309f231ba4556d1c46f3678
+FCREV=861a93b2a4909d0e134b7112ac33fab82d0be9e5
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.23b"