From f01bef85b01ebcbb483e77f451c896829cc997da Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 2 Jul 2026 15:25:34 +0300 Subject: [PATCH 10/10] gtk4: Do not include gdkkeysyms.h directly Include gdk/gdk.h instead. Including gdkkeysyms.h directly gives a compilation error under gtk-4.23. See RM #2064 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/chatline.c | 2 +- client/gui-gtk-4.0/citizensinfo.c | 2 +- client/gui-gtk-4.0/citydlg.c | 2 +- client/gui-gtk-4.0/cityrep.c | 2 +- client/gui-gtk-4.0/cma_fe.c | 2 +- client/gui-gtk-4.0/dialogs.c | 2 +- client/gui-gtk-4.0/editgui.c | 2 +- client/gui-gtk-4.0/editprop.c | 2 +- client/gui-gtk-4.0/gamedlgs.c | 2 +- client/gui-gtk-4.0/gotodlg.c | 2 +- client/gui-gtk-4.0/gui_main.c | 2 +- client/gui-gtk-4.0/gui_stuff.c | 2 +- client/gui-gtk-4.0/luaconsole.c | 2 +- client/gui-gtk-4.0/plrdlg.c | 2 +- client/gui-gtk-4.0/repodlgs.c | 2 +- client/gui-gtk-4.0/wldlg.c | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/gui-gtk-4.0/chatline.c b/client/gui-gtk-4.0/chatline.c index b0f616f31d..c66e8654aa 100644 --- a/client/gui-gtk-4.0/chatline.c +++ b/client/gui-gtk-4.0/chatline.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-4.0/citizensinfo.c b/client/gui-gtk-4.0/citizensinfo.c index 195daf4b4d..0740781906 100644 --- a/client/gui-gtk-4.0/citizensinfo.c +++ b/client/gui-gtk-4.0/citizensinfo.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* common */ #include "citizens.h" diff --git a/client/gui-gtk-4.0/citydlg.c b/client/gui-gtk-4.0/citydlg.c index ac8675ee44..b779ea90a1 100644 --- a/client/gui-gtk-4.0/citydlg.c +++ b/client/gui-gtk-4.0/citydlg.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "bitvector.h" diff --git a/client/gui-gtk-4.0/cityrep.c b/client/gui-gtk-4.0/cityrep.c index 4b010863b4..956539a683 100644 --- a/client/gui-gtk-4.0/cityrep.c +++ b/client/gui-gtk-4.0/cityrep.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-4.0/cma_fe.c b/client/gui-gtk-4.0/cma_fe.c index 12b49d4b36..b9c03b5b7e 100644 --- a/client/gui-gtk-4.0/cma_fe.c +++ b/client/gui-gtk-4.0/cma_fe.c @@ -15,7 +15,7 @@ #include #endif -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-4.0/dialogs.c b/client/gui-gtk-4.0/dialogs.c index 84bda495cc..02be7ce71b 100644 --- a/client/gui-gtk-4.0/dialogs.c +++ b/client/gui-gtk-4.0/dialogs.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "astring.h" diff --git a/client/gui-gtk-4.0/editgui.c b/client/gui-gtk-4.0/editgui.c index f1786010ba..6572235c7b 100644 --- a/client/gui-gtk-4.0/editgui.c +++ b/client/gui-gtk-4.0/editgui.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-4.0/editprop.c b/client/gui-gtk-4.0/editprop.c index 04c53e70de..994a857bf2 100644 --- a/client/gui-gtk-4.0/editprop.c +++ b/client/gui-gtk-4.0/editprop.c @@ -18,7 +18,7 @@ #include /* USHRT_MAX */ #include -#include +#include /* utility */ #include "bitvector.h" diff --git a/client/gui-gtk-4.0/gamedlgs.c b/client/gui-gtk-4.0/gamedlgs.c index 2eb75a64ee..4718354b83 100644 --- a/client/gui-gtk-4.0/gamedlgs.c +++ b/client/gui-gtk-4.0/gamedlgs.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "log.h" diff --git a/client/gui-gtk-4.0/gotodlg.c b/client/gui-gtk-4.0/gotodlg.c index a721fcf344..4347471206 100644 --- a/client/gui-gtk-4.0/gotodlg.c +++ b/client/gui-gtk-4.0/gotodlg.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "astring.h" diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 087da21dfa..aec8ba524d 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -41,7 +41,7 @@ #endif #include -#include +#include /* utility */ #include "fc_cmdline.h" diff --git a/client/gui-gtk-4.0/gui_stuff.c b/client/gui-gtk-4.0/gui_stuff.c index ae00b72993..a9b7c5fced 100644 --- a/client/gui-gtk-4.0/gui_stuff.c +++ b/client/gui-gtk-4.0/gui_stuff.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-4.0/luaconsole.c b/client/gui-gtk-4.0/luaconsole.c index e4267caab5..041f5425b5 100644 --- a/client/gui-gtk-4.0/luaconsole.c +++ b/client/gui-gtk-4.0/luaconsole.c @@ -15,7 +15,7 @@ #include #endif -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-4.0/plrdlg.c b/client/gui-gtk-4.0/plrdlg.c index a5a6fc17ee..7e21269b95 100644 --- a/client/gui-gtk-4.0/plrdlg.c +++ b/client/gui-gtk-4.0/plrdlg.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "astring.h" diff --git a/client/gui-gtk-4.0/repodlgs.c b/client/gui-gtk-4.0/repodlgs.c index d3420e5a4c..83d36d1ce0 100644 --- a/client/gui-gtk-4.0/repodlgs.c +++ b/client/gui-gtk-4.0/repodlgs.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-4.0/wldlg.c b/client/gui-gtk-4.0/wldlg.c index a249e4979f..e811fcb141 100644 --- a/client/gui-gtk-4.0/wldlg.c +++ b/client/gui-gtk-4.0/wldlg.c @@ -19,7 +19,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" -- 2.53.0