[gimp/gimp-2-10] configure.ac: require glib >= 2.56.2
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] configure.ac: require glib >= 2.56.2
- Date: Sun, 8 Mar 2020 10:31:13 +0000 (UTC)
commit bf8f004b151c07ce457cca218c3599a9d9689fb1
Author: Ell <ell_se yahoo com>
Date: Sun Mar 8 12:12:52 2020 +0200
configure.ac: require glib >= 2.56.2
Recent code changes depend on 2.56 symbols, and no one seemed to
complain for 2.10.18, so let's just bump the requirement.
Furthermore, 2.56.0 and 2.56.1 have a Windows-specific bug we were
testing for, so let's just bump straight to 2.56.2.
app/sanity.c | 2 +-
configure.ac | 27 +++++++--------------------
2 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/app/sanity.c b/app/sanity.c
index 5241b8783a..3236546266 100644
--- a/app/sanity.c
+++ b/app/sanity.c
@@ -171,7 +171,7 @@ static gchar *
sanity_check_glib (void)
{
#define GLIB_REQUIRED_MAJOR 2
-#define GLIB_REQUIRED_MINOR 54
+#define GLIB_REQUIRED_MINOR 56
#define GLIB_REQUIRED_MICRO 2
const gchar *mismatch = glib_check_version (GLIB_REQUIRED_MAJOR,
diff --git a/configure.ac b/configure.ac
index 34a1d7e127..e3b221f46a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,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.54.2])
+m4_define([glib_required_version], [2.56.2])
m4_define([gtk_mac_integration_required_version], [2.0.0])
m4_define([gtk_required_version], [2.24.32])
m4_define([gtkdoc_required_version], [1.0])
@@ -705,19 +705,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])])
@@ -786,13 +773,13 @@ if test "x$GDBUS_CODEGEN" = xno; then
add_deps_error([gdbus-codegen], [Could not find gdbus-codegen in your PATH.])
fi
-AC_MSG_CHECKING([if GLib is version 2.43.0 or newer])
-if $PKG_CONFIG --atleast-version=2.43.0 glib-2.0; then
- have_glib_2_43=yes
+AC_MSG_CHECKING([if GLib is version 2.57.0 or newer])
+if $PKG_CONFIG --atleast-version=2.57.0 glib-2.0; then
+ have_glib_2_57=yes
else
- have_glib_2_43=no
+ have_glib_2_57=no
fi
-AC_MSG_RESULT($have_glib_2_43)
+AC_MSG_RESULT($have_glib_2_57)
AC_PATH_PROG(GEGL, gegl, no)
if test "x$GEGL" = xno; then
@@ -2746,7 +2733,7 @@ CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEA
# We must build without problems with future releases of libraries
# and disabling deprecated API risks breaking the build
-if test "x$have_glib_2_43" != "xyes"; then
+if test "x$have_glib_2_57" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]