From 8e7be76bf76f7c5ebcf5149b027c84a8f1c7d8e4 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Thu, 30 Dec 2021 20:07:01 +0000 Subject: [PATCH] bump gtk dependency to 4.6.0 --- meson.build | 12 +++++++----- subprojects/gtk4.wrap | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index bfd202d72..a46e8f921 100644 --- a/meson.build +++ b/meson.build @@ -365,7 +365,7 @@ illegal_char_test_args = [ # GTK/GLIB versions pango_req = '1.50.0' # keep in sync with gtk4 -gtk_req = '4.5.1' +gtk_req = '4.6.0' glib_req = '2.66.0' # --- Add extra languages --- @@ -554,10 +554,12 @@ gtk_version_arr = gtk_req.split('.') gtk_major_version = gtk_version_arr[0] gtk_minor_version = gtk_version_arr[1] add_project_arguments([ - '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version), - '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version), - '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_@0@_@1@'.format(gtk_major_version, 6), # FIXME use gtk_minor_version when 4.6.0 comes out - '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_@0@_@1@'.format(gtk_major_version, 6), ], language: 'c') + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version), + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version), + '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_@0@_@1@'.format(gtk_major_version, gtk_minor_version), + '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_@0@_@1@'.format(gtk_major_version, gtk_minor_version), + ], + language: 'c') foreach func : check_functions if cc.has_function(func[0], dependencies: func[1]) diff --git a/subprojects/gtk4.wrap b/subprojects/gtk4.wrap index 1b423fbdb..8dc242bc4 100644 --- a/subprojects/gtk4.wrap +++ b/subprojects/gtk4.wrap @@ -1,6 +1,6 @@ [wrap-file] -directory = gtk-4.5.1 +directory = gtk-4.6.0 -source_url = https://gitlab.gnome.org/GNOME/gtk/-/archive/4.5.1/gtk-4.5.1.tar.gz -source_filename = gtk-4.5.1.tar.gz -source_hash = 89e54b504c6f4276f86019687f4c0170abe199cdf440b69f84e7fbd8c1e9b1d0 +source_url = https://gitlab.gnome.org/GNOME/gtk/-/archive/4.6.0/gtk-4.6.0.tar.gz +source_filename = gtk-4.6.0.tar.gz +source_hash = c507ffd8af8498a3f5b988d946a503907c3b86db03ce25670dcfbfac031470c4