From 514a5548cdcaf5a60f47067007936dc58055132b Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Mon, 7 Mar 2011 15:43:45 +0100
Subject: [PATCH] configure: require GLib >= 2.28.1

---
 app/sanity.c |  4 ++--
 configure.ac | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/sanity.c b/app/sanity.c
index eab1d0ce06..2466f43a6b 100644
--- a/app/sanity.c
+++ b/app/sanity.c
@@ -125,8 +125,8 @@ static gchar *
 sanity_check_glib (void)
 {
 #define GLIB_REQUIRED_MAJOR 2
-#define GLIB_REQUIRED_MINOR 24
-#define GLIB_REQUIRED_MICRO 0
+#define GLIB_REQUIRED_MINOR 28
+#define GLIB_REQUIRED_MICRO 1
 
   const gchar *mismatch = glib_check_version (GLIB_REQUIRED_MAJOR,
                                               GLIB_REQUIRED_MINOR,
diff --git a/configure.ac b/configure.ac
index 662c43d9d4..cf60fa8cda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
 # required versions of other packages
 m4_define([babl_required_version], [0.1.4])
 m4_define([gegl_required_version], [0.1.6])
-m4_define([glib_required_version], [2.24.0])
+m4_define([glib_required_version], [2.28.1])
 m4_define([gtk_required_version], [2.20.0])
 m4_define([gdk_pixbuf_required_version], [gtk_required_version])
 m4_define([cairo_required_version], [1.8.0])
@@ -467,13 +467,13 @@ PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
 
 PKG_CHECK_MODULES(GIO, gio-2.0)
 
-AC_MSG_CHECKING([if GLib is version 2.30.0 or newer])
-if $PKG_CONFIG --atleast-version=2.30.0 glib-2.0; then
-  have_glib_2_30=yes
+AC_MSG_CHECKING([if GLib is version 2.32.0 or newer])
+if $PKG_CONFIG --atleast-version=2.32.0 glib-2.0; then
+  have_glib_2_32=yes
 else
-  have_glib_2_30=no
+  have_glib_2_32=no
 fi
-AC_MSG_RESULT($have_glib_2_30)
+AC_MSG_RESULT($have_glib_2_32)
 
 
 # Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -1932,7 +1932,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_30" != "xyes"; then
+if test "x$have_glib_2_32" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
 fi