From 62ed8aea02103bbf80dd403a1070435c38086adb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 27 Aug 2023 11:31:20 +0300 Subject: [PATCH 6/6] Meson: Bump minimum gtk4x-client gtk4 requirement to 4.10 See osdn #48548 Signed-off-by: Marko Lindqvist --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index f770c9f752..79564d743b 100644 --- a/meson.build +++ b/meson.build @@ -3013,7 +3013,7 @@ endforeach gtk322_dep = dependency('gtk+-3.0', version : '>= 3.22', required : false) gtk4_dep = dependency('gtk4', version : '>= 4.0.0', required : false) -gtk5_dep = dependency('gtk4', version : '>= 4.8.0', required : false) +gtk5_dep = dependency('gtk4', version : '>= 4.10.0', required : false) if get_option('clients').contains('gtk3.22') @@ -3197,7 +3197,7 @@ endif if get_option('clients').contains('gtk4x') if not gtk5_dep.found() - error('gtk-4.0 >= 4.8 required for gtk4x-client, but not found') + error('gtk-4.0 >= 4.10 required for gtk4x-client, but not found') endif executable('freeciv-gtk4x', @@ -3251,7 +3251,7 @@ executable('freeciv-gtk4x', 'client/gui-gtk-4.0/wldlg.c', clienticon, c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_8', - '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_8', + '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_10', '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'], include_directories: client_inc, @@ -3935,14 +3935,14 @@ endif if get_option('fcmp').contains('gtk4x') if not gtk5_dep.found() - error('gtk-4.0 >= 4.8 required for gtk4x modpack installer, but not found') + error('gtk-4.0 >= 4.10 required for gtk4x modpack installer, but not found') endif executable('freeciv-mp-gtk4x', 'tools/fcmp/mpgui_gtk4.c', mpicon, c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_8', - '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_8', + '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_10', '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'], include_directories: tool_inc, -- 2.40.1