Merge pull request #786 from cazfi/srvup

freeciv/apply_patches.sh

@@ -5,12 +5,6 @@
 # osdn #????? is ticket in freeciv.org tracker:
 # https://osdn.net/projects/freeciv/ticket/?????
 #
-# 0050-Cache-territory-claiming-base-types.patch
-#   Performance improvement
-#   osdn #47345
-# 0050-Correct-filling-of-territory-claiming-extras-cache.patch
-#   Fix terr claiming extras cache
-#   osdn #48838
 # 0025-Autoworkers-Use-ADV_WANTS_EQ-for-comparing-tile-valu.patch
 #   Autoworkers work value fix
 #   osdn #48842
@@ -57,8 +51,6 @@ declare -a GIT_PATCHLIST=(
 )
 
 declare -a PATCHLIST=(
-  "backports/0050-Cache-territory-claiming-base-types"
-  "backports/0050-Correct-filling-of-territory-claiming-extras-cache"
   "backports/0025-Autoworkers-Use-ADV_WANTS_EQ-for-comparing-tile-valu"
   "backports/0032-mapimg_help-Fix-format-overflow-warning"
   "backports/0031-city_from_wonder-Fix-illegal-array-subscript-warning"

freeciv/patches/savegame.patch

@@ -1,6 +1,6 @@
 diff -Nurd freeciv/server/commands.c freeciv/server/commands.c
---- freeciv/server/commands.c	2023-09-03 05:24:19.832252951 +0300
-+++ freeciv/server/commands.c	2023-09-03 05:24:30.656357307 +0300
+--- freeciv/server/commands.c	2023-11-23 00:08:14.914204235 +0200
++++ freeciv/server/commands.c	2023-11-23 00:08:21.958242708 +0200
 @@ -552,7 +552,7 @@
        "all cities and units etc. Use with care!"), NULL,
     CMD_ECHO_ALL, VCF_NONE, 50
@@ -11,8 +11,8 @@ diff -Nurd freeciv/server/commands.c freeciv/server/commands.c
     N_("save\n"
        "save <file-name>"),
 diff -Nurd freeciv/server/savegame/savemain.c freeciv/server/savegame/savemain.c
---- freeciv/server/savegame/savemain.c	2023-09-03 05:24:19.856253182 +0300
-+++ freeciv/server/savegame/savemain.c	2023-09-03 05:24:30.656357307 +0300
+--- freeciv/server/savegame/savemain.c	2023-11-23 00:08:14.922204280 +0200
++++ freeciv/server/savegame/savemain.c	2023-11-23 00:08:21.958242708 +0200
 @@ -152,8 +152,8 @@
    stdata->save_compress_level = game.server.save_compress_level;
 
@@ -39,8 +39,8 @@ diff -Nurd freeciv/server/savegame/savemain.c freeciv/server/savegame/savemain.c
    timer_user = timer_new(TIMER_USER, TIMER_ACTIVE, "save user");
    timer_start(timer_cpu);
 diff -Nurd freeciv/server/stdinhand.c freeciv/server/stdinhand.c
---- freeciv/server/stdinhand.c	2023-09-03 05:24:19.844253067 +0300
-+++ freeciv/server/stdinhand.c	2023-09-03 05:28:20.614581947 +0300
+--- freeciv/server/stdinhand.c	2023-11-23 00:08:14.918204257 +0200
++++ freeciv/server/stdinhand.c	2023-11-23 00:08:21.962242728 +0200
 @@ -21,6 +21,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -105,7 +105,7 @@ diff -Nurd freeciv/server/stdinhand.c freeciv/server/stdinhand.c
    if (check) {
      return TRUE;
    }
-@@ -4507,6 +4518,35 @@
+@@ -4522,6 +4533,35 @@
 
    level = command_level(command_by_number(cmd));
 

freeciv/version.txt

@@ -1,7 +1,7 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=6651030428b8817640fd609ac9329d8915549247
+FCREV=696f3eee00833fbfc52465f39cc8fa464bc4441e
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Oct.09"