Skip to content

Commit 5cc3355

Browse files
committed
meson: Bump GLIB_VERSION_MAX_ALLOWED to 2.76
libglnx update in d7fcee0 uses g_clear_fd() (GLib >= 2.76), but GLIB_VERSION_MAX_ALLOWED was still 2.70, triggering deprecation warnings when compiling with newer Glib. g_clear_fd() has a compat implementation inside libglnx so there's no need to bump the minimum GLib requirement.
1 parent 483c4a5 commit 5cc3355

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AC_INIT([flatpak-builder],
1313
[http://flatpak.org/])
1414

1515
AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_66], [Glib min version])
16-
AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_70], [Glib max version])
16+
AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_76], [Glib max version])
1717

1818
GLIB_REQS=2.66
1919
OSTREE_REQS=2017.14

src/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ config_data.set_quoted('DEBUGEDIT', debugedit.full_path())
3333
config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
3434
config_data.set_quoted('PACKAGE_VERSION', meson.project_version())
3535
config_data.set_quoted('PACKAGE_STRING', '@0@-@1@'.format(meson.project_name(), meson.project_version()))
36-
config_data.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_2_70')
36+
config_data.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_2_76')
3737
config_data.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_66')
3838

3939
# We support targeting specific fuse versions to optimize performance.

0 commit comments

Comments
 (0)