Merge pull request #779 from cazfi/srvup

freeciv · Nov 14, 2023 · 479ac4f · 479ac4f
2 parents 11bfcb1 + cf7c4b9
commit 479ac4f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/fc_types.js b/freeciv-web/src/main/webapp/javascript/fc_types.js
@@ -334,18 +334,20 @@ var VUT_DIPLREL_UNITANY_O = 48;
 var VUT_COUNT = 49;             /* Keep this last. */
 
 /* Freeciv's gui_type enum */
-/* Used for options which do not belong to any gui. */
+/* GUI_STUB used for options which do not belong to any gui. */
 var GUI_STUB    = 0;
 var GUI_GTK2    = 1;
 var GUI_GTK3    = 2;
 var GUI_GTK3_22 = 3;
+var GUI_QT      = 4;
 /* GUI_SDL remains for now for keeping client options alive until
  * user has migrated them to sdl2-client */
-var GUI_SDL     = 4;
-var GUI_QT      = 5;
+var GUI_SDL     = 5;
 var GUI_SDL2    = 6;
-var GUI_WEB     = 7;
-var GUI_GTK3x   = 8;
+var GUI_SDL3    = 7;
+var GUI_WEB     = 8;
+var GUI_GTK4    = 9;
+var GUI_GTK5    = 10;
 
 /* Sometimes we don't know (or don't care) if some requirements for effect
  * are currently fulfilled or not. This enum tells lower level functions

diff --git a/freeciv/patches/metachange.patch b/freeciv/patches/metachange.patch
@@ -1,6 +1,6 @@
 diff -Nurd freeciv/server/connecthand.c freeciv/server/connecthand.c
---- freeciv/server/connecthand.c	2023-03-11 03:50:04.941527761 +0200
-+++ freeciv/server/connecthand.c	2023-03-11 03:50:14.317578810 +0200
+--- freeciv/server/connecthand.c	2023-11-09 00:49:39.588315816 +0200
++++ freeciv/server/connecthand.c	2023-11-09 00:49:52.828396400 +0200
 @@ -163,7 +163,7 @@
      /* First connection
       * Replace "restarting in x seconds" meta message */
@@ -9,10 +9,10 @@ diff -Nurd freeciv/server/connecthand.c freeciv/server/connecthand.c
 +    (void) send_server_info_to_metaserver(META_FORCE);
    }
 
-   /* introduce the server to the connection */
+   /* Introduce the server to the connection */
 diff -Nurd freeciv/server/meta.c freeciv/server/meta.c
---- freeciv/server/meta.c	2023-03-11 03:50:04.941527761 +0200
-+++ freeciv/server/meta.c	2023-03-11 03:51:02.557837885 +0200
+--- freeciv/server/meta.c	2023-11-09 00:49:39.588315816 +0200
++++ freeciv/server/meta.c	2023-11-09 00:49:52.828396400 +0200
 @@ -391,6 +391,10 @@
          }
        } players_iterate_end;
@@ -34,8 +34,8 @@ diff -Nurd freeciv/server/meta.c freeciv/server/meta.c
          want_update = TRUE; /* We couldn't update now, but update a.s.a.p. */
        }
 diff -Nurd freeciv/server/meta.h freeciv/server/meta.h
---- freeciv/server/meta.h	2023-03-11 03:50:04.941527761 +0200
-+++ freeciv/server/meta.h	2023-03-11 03:50:14.317578810 +0200
+--- freeciv/server/meta.h	2023-11-09 00:49:39.588315816 +0200
++++ freeciv/server/meta.h	2023-11-09 00:49:52.828396400 +0200
 @@ -19,13 +19,14 @@
 
  #define DEFAULT_META_SERVER_NO_SEND  TRUE

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=ae78f423eadabec4593ae92243d7ac3ca7513870
+FCREV=561513d08fe0a5a8cd0e65fbe3502ea9328b067f
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Oct.02"