From 80f01dec8b178fce3abd2cab3dbd6ddc506670f2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 2 Jul 2026 15:25:34 +0300 Subject: [PATCH 32/32] gtk4(x): 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 +- client/gui-gtk-5.0/chatline.c | 2 +- client/gui-gtk-5.0/citizensinfo.c | 2 +- client/gui-gtk-5.0/citydlg.c | 2 +- client/gui-gtk-5.0/cityrep.c | 2 +- client/gui-gtk-5.0/cma_fe.c | 2 +- client/gui-gtk-5.0/dialogs.c | 2 +- client/gui-gtk-5.0/editgui.c | 2 +- client/gui-gtk-5.0/editprop.c | 2 +- client/gui-gtk-5.0/gamedlgs.c | 2 +- client/gui-gtk-5.0/gotodlg.c | 2 +- client/gui-gtk-5.0/gui_main.c | 2 +- client/gui-gtk-5.0/gui_stuff.c | 2 +- client/gui-gtk-5.0/luaconsole.c | 2 +- client/gui-gtk-5.0/plrdlg.c | 2 +- client/gui-gtk-5.0/repodlgs.c | 2 +- client/gui-gtk-5.0/wldlg.c | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/client/gui-gtk-4.0/chatline.c b/client/gui-gtk-4.0/chatline.c index d493573d41..27ccd986d5 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 8062806e26..39b7a2aeea 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 44b38913bf..6f07c07e45 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 68966d8547..4eb60b3a8a 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 f29bd5e352..67ce024c99 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 b8157e6004..9e5b5d6af1 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 204e12882a..6dc9551669 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 237b632b9f..66e3b773de 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 62571b645b..5fe56b5cef 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 c5d28369ef..31ee468f5b 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 d453c92fbb..c3bd5e3800 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 7781bb8689..3832af2498 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 dbb3b6a890..c52bac4d73 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" diff --git a/client/gui-gtk-5.0/chatline.c b/client/gui-gtk-5.0/chatline.c index 2cfcf74d6b..ee9b9b403b 100644 --- a/client/gui-gtk-5.0/chatline.c +++ b/client/gui-gtk-5.0/chatline.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-5.0/citizensinfo.c b/client/gui-gtk-5.0/citizensinfo.c index d38662c6e2..be8134e824 100644 --- a/client/gui-gtk-5.0/citizensinfo.c +++ b/client/gui-gtk-5.0/citizensinfo.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* common */ #include "citizens.h" diff --git a/client/gui-gtk-5.0/citydlg.c b/client/gui-gtk-5.0/citydlg.c index d9b5add023..3991aac2f3 100644 --- a/client/gui-gtk-5.0/citydlg.c +++ b/client/gui-gtk-5.0/citydlg.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "bitvector.h" diff --git a/client/gui-gtk-5.0/cityrep.c b/client/gui-gtk-5.0/cityrep.c index ae6dfea765..788f34f8ba 100644 --- a/client/gui-gtk-5.0/cityrep.c +++ b/client/gui-gtk-5.0/cityrep.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-5.0/cma_fe.c b/client/gui-gtk-5.0/cma_fe.c index 4047df6360..8d6ee28dc9 100644 --- a/client/gui-gtk-5.0/cma_fe.c +++ b/client/gui-gtk-5.0/cma_fe.c @@ -15,7 +15,7 @@ #include #endif -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-5.0/dialogs.c b/client/gui-gtk-5.0/dialogs.c index 8b12957f69..c5b92631f5 100644 --- a/client/gui-gtk-5.0/dialogs.c +++ b/client/gui-gtk-5.0/dialogs.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "astring.h" diff --git a/client/gui-gtk-5.0/editgui.c b/client/gui-gtk-5.0/editgui.c index fb7d5d53ac..70813419c2 100644 --- a/client/gui-gtk-5.0/editgui.c +++ b/client/gui-gtk-5.0/editgui.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-5.0/editprop.c b/client/gui-gtk-5.0/editprop.c index a9024ebf97..60bf6817ed 100644 --- a/client/gui-gtk-5.0/editprop.c +++ b/client/gui-gtk-5.0/editprop.c @@ -18,7 +18,7 @@ #include /* USHRT_MAX */ #include -#include +#include /* utility */ #include "bitvector.h" diff --git a/client/gui-gtk-5.0/gamedlgs.c b/client/gui-gtk-5.0/gamedlgs.c index 987a0682ce..4c0213654a 100644 --- a/client/gui-gtk-5.0/gamedlgs.c +++ b/client/gui-gtk-5.0/gamedlgs.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "log.h" diff --git a/client/gui-gtk-5.0/gotodlg.c b/client/gui-gtk-5.0/gotodlg.c index 9e6ffc867e..ba621da7b9 100644 --- a/client/gui-gtk-5.0/gotodlg.c +++ b/client/gui-gtk-5.0/gotodlg.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "astring.h" diff --git a/client/gui-gtk-5.0/gui_main.c b/client/gui-gtk-5.0/gui_main.c index ff4a42a3b5..a2316a4f19 100644 --- a/client/gui-gtk-5.0/gui_main.c +++ b/client/gui-gtk-5.0/gui_main.c @@ -41,7 +41,7 @@ #endif #include -#include +#include /* utility */ #include "fc_cmdline.h" diff --git a/client/gui-gtk-5.0/gui_stuff.c b/client/gui-gtk-5.0/gui_stuff.c index 9b4f51dfcb..90a1047177 100644 --- a/client/gui-gtk-5.0/gui_stuff.c +++ b/client/gui-gtk-5.0/gui_stuff.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-5.0/luaconsole.c b/client/gui-gtk-5.0/luaconsole.c index 8ae3974bb8..7152f29634 100644 --- a/client/gui-gtk-5.0/luaconsole.c +++ b/client/gui-gtk-5.0/luaconsole.c @@ -15,7 +15,7 @@ #include #endif -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-5.0/plrdlg.c b/client/gui-gtk-5.0/plrdlg.c index 701bdbb049..f77c5ad441 100644 --- a/client/gui-gtk-5.0/plrdlg.c +++ b/client/gui-gtk-5.0/plrdlg.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* utility */ #include "astring.h" diff --git a/client/gui-gtk-5.0/repodlgs.c b/client/gui-gtk-5.0/repodlgs.c index 2afa3b53ce..f8671cafae 100644 --- a/client/gui-gtk-5.0/repodlgs.c +++ b/client/gui-gtk-5.0/repodlgs.c @@ -21,7 +21,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-gtk-5.0/wldlg.c b/client/gui-gtk-5.0/wldlg.c index 510cca81f1..cbca666ba7 100644 --- a/client/gui-gtk-5.0/wldlg.c +++ b/client/gui-gtk-5.0/wldlg.c @@ -19,7 +19,7 @@ #include #include -#include +#include /* utility */ #include "fcintl.h" -- 2.53.0