diff --git a/meson.build b/meson.build index 090ebeb8c8..2959a8dbfe 100644 --- a/meson.build +++ b/meson.build @@ -11,8 +11,8 @@ project('gtk', 'c', license: 'LGPL-2.1-or-later') # keep these numbers in sync with wrap files where there exist -glib_req = '>= 2.72.0' -introspection_req = '>= 1.72.0' # keep this in sync with glib +glib_req = '>= 2.76.0' +introspection_req = '>= 1.76.0' # keep this in sync with glib pango_req = '>= 1.50.0' # keep this in sync with .gitlab-ci/test-msys.sh harfbuzz_req = '>= 2.6.0' fribidi_req = '>= 1.0.6' @@ -365,13 +365,6 @@ glib_dep = dependency('glib-2.0', version: glib_req) gobject_dep = dependency('gobject-2.0', version: glib_req) if os_win32 giowin32_dep = dependency('gio-windows-2.0', version: glib_req, required: win32_enabled) - if giowin32_dep.version().version_compare('<2.75.0') - if cc.get_id() == 'msvc' and get_option('default_library') != 'static' - # Override _GLIB_EXTERN on Visual Studio for media modules for glib <= 2.74.x, so that we - # avoid error C2375 (redefinition; different linkage) when building the g_io_module_*() bits - cdata.set('MODULES_OVERRIDE_GLIB_EXTERN', true) - endif - endif endif if os_unix giounix_dep = dependency('gio-unix-2.0', version: glib_req, required: false) diff --git a/modules/media/gtkffmediafile.c b/modules/media/gtkffmediafile.c index 0103e5bd16..2839cb8174 100644 --- a/modules/media/gtkffmediafile.c +++ b/modules/media/gtkffmediafile.c @@ -19,15 +19,6 @@ #include "config.h" -/* - * Sadly, we need this to build on Visual Studio against glib-2.74.x or earlier, - * otherwise the build will fail when building the g_io_module_*() bits with error C2375 - * (redefinition; different linkage). This must be before including the Gio headers. - */ -#if defined (_MSC_VER) && defined (MODULES_OVERRIDE_GLIB_EXTERN) -# define _GLIB_EXTERN __declspec(dllexport) extern -#endif - #include "gtkffmediafileprivate.h" #include diff --git a/modules/media/gtkgstmediafile.c b/modules/media/gtkgstmediafile.c index 7353539ef6..5487bb0571 100644 --- a/modules/media/gtkgstmediafile.c +++ b/modules/media/gtkgstmediafile.c @@ -19,15 +19,6 @@ #include "config.h" -/* - * Sadly, we need this to build on Visual Studio against glib-2.74.x or earlier, - * otherwise the build will fail when building the g_io_module_*() bits with error C2375 - * (redefinition; different linkage). This must be before including the Gio headers. - */ -#if defined (_MSC_VER) && defined (MODULES_OVERRIDE_GLIB_EXTERN) -# define _GLIB_EXTERN __declspec(dllexport) extern -#endif - #include "gtkgstmediafileprivate.h" #include "gtkgstpaintableprivate.h" diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index 0c1cb6b806..fb9c1ac9e0 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -2,7 +2,7 @@ directory = glib url = https://gitlab.gnome.org/GNOME/glib.git push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/glib.git -revision = 2.74.4 +revision = 2.76.0 depth = 1 [provide] diff --git a/subprojects/gobject-introspection.wrap b/subprojects/gobject-introspection.wrap index e00b3e0a81..f745ec9fcb 100644 --- a/subprojects/gobject-introspection.wrap +++ b/subprojects/gobject-introspection.wrap @@ -2,7 +2,7 @@ directory = gobject-introspection url = https://gitlab.gnome.org/GNOME/gobject-introspection.git push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/gobject-introspection.git -revision = 1.74.0 +revision = 1.76.0 depth = 1 [provide]