[gtkmm] Use glibmm-2.60 instead of glibmm-2.58

[Kjell Ahlstedt <kjellahl src gnome org>]

commit cbab54c8bc397a85af47c222adc199d0d00320a2
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Nov 6 10:39:04 2018 +0100

    Use glibmm-2.60 instead of glibmm-2.58
    
    and use atkmm-2.30 instead of atkmm-2.28, and pangomm-2.44 instead of
    pangomm-2.42. We have changed the ABI name in glibmm, atkmm and pangomm.

 MSVC_NMake/config-msvc.mak |  6 +++---
 configure.ac               | 14 +++++++-------
 tools/Makefile.am          |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 1812ff9c..a4bd0844 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -46,11 +46,11 @@ LIBSIGC_MINOR_VERSION = 0
 CAIROMM_MAJOR_VERSION = 1
 CAIROMM_MINOR_VERSION = 16
 GLIBMM_MAJOR_VERSION = 2
-GLIBMM_MINOR_VERSION = 58
+GLIBMM_MINOR_VERSION = 60
 ATKMM_MAJOR_VERSION = 2
-ATKMM_MINOR_VERSION = 28
+ATKMM_MINOR_VERSION = 30
 PANGOMM_MAJOR_VERSION = 2
-PANGOMM_MINOR_VERSION = 42
+PANGOMM_MINOR_VERSION = 44
 GTKMM_MAJOR_VERSION = 4
 GTKMM_MINOR_VERSION = 0
 
diff --git a/configure.ac b/configure.ac
index ade6cb36..ea722c37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ AS_IF([test "x$enable_static" = xyes],
 # gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
 # The extra gdk-pixbuf-2.0 check is because gdkmm requires a newer gdk-pixbuf than gtk+-4.0 requires.
 # TODO: Remove the mention of cairomm once pangomm needs to depend on such a new version.
-AC_SUBST([GDKMM_MODULES], ['giomm-2.58 >= 2.55.2 pangomm-2.42 >= 2.41.5 cairomm-1.16 >= 1.15.4 gtk+-4.0 >= 
3.93.0 gdk-pixbuf-2.0 >= 2.35.5'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.60 >= 2.59.1 pangomm-2.44 >= 2.43.1 cairomm-1.16 >= 1.15.4 gtk+-4.0 >= 
3.94.0 gdk-pixbuf-2.0 >= 2.35.5'])
 
 AS_IF([test "x$gtkmm_host_windows" = xyes],
       [GTKMM_MODULES=$GDKMM_MODULES],
@@ -106,7 +106,7 @@ AS_IF([test "x$gtkmm_host_windows" = xyes],
 GTKMM_ARG_ENABLE_API_ATKMM
 
 AS_IF([test "x$gtkmm_enable_api_atkmm" != xno],
-      [GTKMM_MODULES="atkmm-2.28 >= 2.27.1 $GTKMM_MODULES"])
+      [GTKMM_MODULES="atkmm-2.30 >= 2.29.1 $GTKMM_MODULES"])
 AC_SUBST([GTKMM_MODULES])
 
 AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2'])
@@ -117,18 +117,18 @@ PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
-MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.58])
-MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-2.42 atkmm-2.28])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.60])
+MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-2.44 atkmm-2.30])
 
 MM_ARG_DISABLE_DEPRECATED_API([GDKMM GTKMM])
 
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
 MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm-2.58.tag], [glibmm-2.58])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.60.tag], [glibmm-2.60])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.16.tag], [cairomm-1.16])
-MM_ARG_WITH_TAGFILE_DOC([pangomm-2.42.tag], [pangomm-2.42])
-MM_ARG_WITH_TAGFILE_DOC([atkmm-2.28.tag], [atkmm-2.28])
+MM_ARG_WITH_TAGFILE_DOC([pangomm-2.44.tag], [pangomm-2.44])
+MM_ARG_WITH_TAGFILE_DOC([atkmm-2.30.tag], [atkmm-2.30])
 
 # glib-compile-resources and C compiler are needed to generate and compile
 # resource files in demo programs.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d7290bd5..1e6e21f7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -27,11 +27,11 @@ noinst_PROGRAMS = extra_defs_gen/generate_defs_gdk \
                   extra_defs_gen/generate_defs_gtk
 
 extra_defs_gen_generate_defs_gdk_SOURCES = extra_defs_gen/generate_defs_gdk.cc
-extra_defs_gen_generate_defs_gdk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.58
+extra_defs_gen_generate_defs_gdk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.60
 extra_defs_gen_generate_defs_gdk_LDFLAGS = -no-undefined -avoid-version
 
 extra_defs_gen_generate_defs_gtk_SOURCES = extra_defs_gen/generate_defs_gtk.cc
-extra_defs_gen_generate_defs_gtk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.58
+extra_defs_gen_generate_defs_gtk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.60
 extra_defs_gen_generate_defs_gtk_LDFLAGS = -no-undefined -avoid-version
 
 AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS)