Merge pull request #850 from cazfi/srvup

freeciv · May 24, 2024 · 725a876 · 725a876
2 parents d931d6b + 25c6aaf
commit 725a876
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/freeciv/patches/maphand_ch.patch b/freeciv/patches/maphand_ch.patch
@@ -1,7 +1,7 @@
 diff -Nurd freeciv/common/networking/packets.def freeciv/common/networking/packets.def
---- freeciv/common/networking/packets.def	2023-10-29 13:48:12.627769696 +0200
-+++ freeciv/common/networking/packets.def	2023-10-29 13:48:22.407818344 +0200
-@@ -2461,3 +2461,13 @@
+--- freeciv/common/networking/packets.def	2024-05-18 00:46:38.885812349 +0300
++++ freeciv/common/networking/packets.def	2024-05-18 00:46:49.709919374 +0300
+@@ -2468,3 +2468,13 @@
    TILE dest;
    UINT32 turns;
  end
@@ -16,8 +16,8 @@ diff -Nurd freeciv/common/networking/packets.def freeciv/common/networking/packe
 +  STRING message[MAX_LEN_MSG];
 +end
 diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
---- freeciv/server/maphand.c	2023-10-29 13:48:13.143772263 +0200
-+++ freeciv/server/maphand.c	2023-10-29 14:07:13.112339222 +0200
+--- freeciv/server/maphand.c	2024-05-18 00:46:39.253815986 +0300
++++ freeciv/server/maphand.c	2024-05-18 00:46:49.709919374 +0300
 @@ -16,6 +16,7 @@
  #endif
 
@@ -34,7 +34,7 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
  #include "events.h"
  #include "game.h"
  #include "map.h"
-@@ -2688,3 +2690,380 @@
+@@ -2729,3 +2731,380 @@
      }
    }
  }
@@ -416,8 +416,8 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
 +  astr_free(&str);
 +}
 diff -Nurd freeciv/server/maphand.h freeciv/server/maphand.h
---- freeciv/server/maphand.h	2023-10-29 13:48:13.143772263 +0200
-+++ freeciv/server/maphand.h	2023-10-29 13:48:22.407818344 +0200
+--- freeciv/server/maphand.h	2024-05-18 00:46:39.253815986 +0300
++++ freeciv/server/maphand.h	2024-05-18 00:46:49.709919374 +0300
 @@ -147,4 +147,7 @@
  void tile_change_side_effects(struct tile *ptile, bool refresh_city)
    fc__attribute((nonnull (1)));

diff --git a/freeciv/patches/text_fixes.patch b/freeciv/patches/text_fixes.patch
@@ -1,6 +1,6 @@
 diff -Nurd freeciv/common/featured_text.c freeciv/common/featured_text.c
---- freeciv/common/featured_text.c	2023-10-02 22:42:27.773708168 +0300
-+++ freeciv/common/featured_text.c	2023-10-02 22:43:29.830360463 +0300
+--- freeciv/common/featured_text.c	2024-05-18 00:35:47.171455034 +0300
++++ freeciv/common/featured_text.c	2024-05-18 00:35:56.371542975 +0300
 @@ -74,7 +74,7 @@
 
  const struct ft_color ftc_warning       = FT_COLOR("#FF0000",   nullptr);
@@ -47,9 +47,9 @@ diff -Nurd freeciv/common/featured_text.c freeciv/common/featured_text.c
  }
 
 diff -Nurd freeciv/server/srv_main.c freeciv/server/srv_main.c
---- freeciv/server/srv_main.c	2023-10-02 22:42:28.529716131 +0300
-+++ freeciv/server/srv_main.c	2023-10-02 22:42:38.921825554 +0300
-@@ -2580,7 +2580,12 @@
+--- freeciv/server/srv_main.c	2024-05-18 00:35:47.567458819 +0300
++++ freeciv/server/srv_main.c	2024-05-18 00:35:56.371542975 +0300
+@@ -2627,7 +2627,12 @@
    pplayer->style = style_of_nation(pnation);
 
    if (set_name) {

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=f1222d0ee67e7e6f36e9f7f94d00f3e6161ab922
+FCREV=6fd1b3cd58e4822acb2808e59bf5462f8c0f8e96
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.23"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.23b"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are