From 88e313a2fd1ccd4388af2d44bfd5d8b8756c4b8e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 21 Sep 2024 11:42:00 +0300 Subject: [PATCH 55/55] gtk4x fcmp: Disallow anything deprecated in gtk-4.10 See RM #902 Signed-off-by: Marko Lindqvist --- configure.ac | 4 ++-- meson.build | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 306001eb42..79b0767c3b 100644 --- a/configure.ac +++ b/configure.ac @@ -1254,8 +1254,8 @@ if test "x$req_fcmp_gtk5" = "xyes" || test "x$modinst" = "xall" || test "x$modinst" = "xauto" ; then PKG_CHECK_MODULES([GTK5_MP], [gtk4 >= 4.10.0], [ - GTK5_MP_CFLAGS="$GTK5_MP_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_8" - GTK5_MP_CFLAGS="$GTK5_MP_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66" + GTK5_MP_CFLAGS="$GTK5_MP_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_10" + GTK5_MP_CFLAGS="$GTK5_MP_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_72" PKG_CHECK_MODULES([GTHREAD_GTK5], [gthread-2.0], [ fcmp_gtk5=yes diff --git a/meson.build b/meson.build index 0dce561720..a7b02dc8af 100644 --- a/meson.build +++ b/meson.build @@ -4254,10 +4254,10 @@ endif executable('freeciv-mp-gtk4x', 'tools/fcmp/mpgui_gtk5.c', mpicon, - c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_8', + c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_10', '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_10', - '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', - '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'], + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_72', + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_72'], include_directories: tool_inc, sources: [verhdr], dependencies: [gtk5_dep, sqlite3_dep, gettext_dep], -- 2.45.2