[gimp] configure.ac, meson: require glib >= 2.56.2



commit 52ae7d180a293d0e6ced409a8e30c0ed5494cd14
Author: Ell <ell_se yahoo com>
Date:   Sun Mar 8 12:15:41 2020 +0200

    configure.ac, meson: require glib >= 2.56.2
    
    GLib 2.56.0 and 2.56.1 have a Windows-specific bug we were testing
    for, so let's just bump to 2.56.2.

 app/sanity.c |  2 +-
 configure.ac | 15 +--------------
 meson.build  |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/app/sanity.c b/app/sanity.c
index 13834df148..c0a64bd01b 100644
--- a/app/sanity.c
+++ b/app/sanity.c
@@ -172,7 +172,7 @@ sanity_check_glib (void)
 {
 #define GLIB_REQUIRED_MAJOR 2
 #define GLIB_REQUIRED_MINOR 56
-#define GLIB_REQUIRED_MICRO 0
+#define GLIB_REQUIRED_MICRO 2
 
   const gchar *mismatch = glib_check_version (GLIB_REQUIRED_MAJOR,
                                               GLIB_REQUIRED_MINOR,
diff --git a/configure.ac b/configure.ac
index da02e3d227..310790b3ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ m4_define([gegl_micro_version], [23])
 m4_define([gegl_required_version],
           [gegl_major_minor_version.gegl_micro_version])
 m4_define([gexiv2_required_version], [0.10.6])
-m4_define([glib_required_version], [2.56.0])
+m4_define([glib_required_version], [2.56.2])
 m4_define([gtk_mac_integration_required_version], [2.0.0])
 m4_define([gtk_required_version], [3.22.29])
 m4_define([gtkdoc_required_version], [1.0])
@@ -714,19 +714,6 @@ PKG_CHECK_MODULES(GEGL, gegl-gegl_major_minor_version >= gegl_required_version,,
 PKG_CHECK_MODULES(ATK, atk >= atk_required_version,,
                   [add_deps_error([atk >= atk_required_version])])
 
-# glib 2.56.0 and 2.56.1 have a bad bug on Win32, breaking the file
-# chooser dialogs. This has been fixed, but no release made yet. When
-# 2.56.2 is released, the additional test for these broken versions can
-# be removed and we can bump the requirement to glib 2.56.2.
-AM_PATH_GLIB_2_0(glib_required_version,
-                 [if test "x$platform_win32" = "xyes"; then
-                   PKG_CHECK_MODULES(GLIB_WIN_BUG, glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2,
-                                     [add_deps_error([glib >= glib_required_version except glib 2.56.0 and 
2.56.1 (broken on Win32 - bug 795855)])],:)
-                 fi],
-                 [add_deps_error([glib >= glib_required_version],
-                                 [Test for GLIB failed])],
-                 gobject)
-
 PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0,,
                   [add_deps_error([gmodule-no-export-2.0])])
 
diff --git a/meson.build b/meson.build
index 06428caed6..8e16afceea 100644
--- a/meson.build
+++ b/meson.build
@@ -351,7 +351,7 @@ gio               = dependency('gio-2.0')
 gio_specific_name = platform_windows ? 'gio-windows-2.0' : 'gio-unix-2.0'
 gio_specific      = dependency(gio_specific_name)
 
-glib_minver       = platform_windows ? '2.56.2' : '2.54.2'
+glib_minver       = '2.56.2'
 glib              = dependency('glib-2.0',           version: '>='+glib_minver)
 
 conf.set('G_DISABLE_DEPRECATED', glib.version().version_compare('>=2.57'))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]