Project

General

Profile

Bug #997 ยป 0054-gtk4x-fcmp-Disallow-anything-deprecated-in-gtk-4.14.patch

Marko Lindqvist, 10/21/2024 02:16 AM

View differences:

configure.ac
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],
PKG_CHECK_MODULES([GTK5_MP], [gtk4 >= 4.14.0],
[
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"
GTK5_MP_CFLAGS="$GTK5_MP_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_14"
GTK5_MP_CFLAGS="$GTK5_MP_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_76"
PKG_CHECK_MODULES([GTHREAD_GTK5], [gthread-2.0],
[
fcmp_gtk5=yes
meson.build
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.10.0', required : false)
gtk5_dep = dependency('gtk4', version : '>= 4.14.0', required : false)
if get_option('clients').contains('gtk3.22')
......
if get_option('clients').contains('gtk4x')
if not gtk5_dep.found()
error('gtk-4.0 >= 4.10 required for gtk4x-client, but not found')
error('gtk-4.0 >= 4.14 required for gtk4x-client, but not found')
endif
executable('freeciv-gtk4x',
......
if get_option('fcmp').contains('gtk4x')
if not gtk5_dep.found()
error('gtk-4.0 >= 4.10 required for gtk4x modpack installer, but not found')
error('gtk-4.0 >= 4.14 required for gtk4x modpack installer, but not found')
endif
executable('freeciv-mp-gtk4x',
'tools/fcmp/mpgui_gtk5.c',
mpicon,
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_72',
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_72'],
c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_14',
'-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_14',
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_76',
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_76'],
include_directories: tool_inc,
sources: [verhdr],
dependencies: [gtk5_dep, sqlite3_dep, gettext_dep],
    (1-1/1)