GNOME.org
 

[gtkmm] Use glibmm-2.68, pangomm-2.48 instead of glibmm-2.66, pangomm-2.44

commit 1683e5ae3ae01967e1bf4fd9e4fc6f294e00da21
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Dec 11 18:31:10 2020 +0100

    Use glibmm-2.68, pangomm-2.48 instead of glibmm-2.66, pangomm-2.44
    
    We have changed the ABI name in glibmm and pangomm.

 MSVC_NMake/config-msvc.mak       |  4 ++--
 configure.ac                     | 10 +++++-----
 docs/reference/meson.build       |  4 ++--
 meson.build                      | 12 ++++++------
 tools/Makefile.am                |  4 ++--
 tools/extra_defs_gen/meson.build |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 0bb7df5d..76aaef54 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -54,9 +54,9 @@ LIBSIGC_MINOR_VERSION = 0
 CAIROMM_MAJOR_VERSION = 1
 CAIROMM_MINOR_VERSION = 16
 GLIBMM_MAJOR_VERSION = 2
-GLIBMM_MINOR_VERSION = 66
+GLIBMM_MINOR_VERSION = 68
 PANGOMM_MAJOR_VERSION = 2
-PANGOMM_MINOR_VERSION = 44
+PANGOMM_MINOR_VERSION = 48
 GTKMM_MAJOR_VERSION = 4
 GTKMM_MINOR_VERSION = 0
 
diff --git a/configure.ac b/configure.ac
index ab1a10ce..6e0d68f7 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 gtk4 requires.
 # TODO: Remove the mention of cairomm once pangomm needs to depend on such a new version.
-AC_SUBST([GDKMM_MODULES], ['giomm-2.66 >= 2.65.1 pangomm-2.44 >= 2.43.3 cairomm-1.16 >= 1.15.4 gtk4 >= 
3.99.0 gdk-pixbuf-2.0 >= 2.35.5'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.68 >= 2.67.1 pangomm-2.48 >= 2.47.1 cairomm-1.16 >= 1.15.4 gtk4 >= 
3.99.4 gdk-pixbuf-2.0 >= 2.35.5'])
 
 AS_IF([test "x$gtkmm_host_windows" = xyes],
       [GTKMM_MODULES=$GDKMM_MODULES],
@@ -114,17 +114,17 @@ 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.66])
-MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-2.44])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.68])
+MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-2.48])
 
 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.66.tag], [glibmm-2.66])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.68.tag], [glibmm-2.68])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.16.tag], [cairomm-1.16])
-MM_ARG_WITH_TAGFILE_DOC([pangomm-2.44.tag], [pangomm-2.44])
+MM_ARG_WITH_TAGFILE_DOC([pangomm-2.48.tag], [pangomm-2.48])
 
 # glib-compile-resources and C compiler are needed to generate and compile
 # resource files in demo programs.
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 075f475f..3e9fc612 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -10,9 +10,9 @@
 tag_file_modules = [
   'mm-common-libstdc++',
   'sigc++-3.0',
-  'glibmm-2.66',
+  'glibmm-2.68',
   'cairomm-1.16',
-  'pangomm-2.44',
+  'pangomm-2.48',
 ]
 doxygen_tagfiles = ''
 docinstall_flags = []
diff --git a/meson.build b/meson.build
index 116d0c90..998f7163 100644
--- a/meson.build
+++ b/meson.build
@@ -99,17 +99,17 @@ install_pkgconfigdir = install_libdir / 'pkgconfig'
 
 # glibmm recently gained Meson build support, so we can try looking
 # for its pkg-config files on Visual Studio as well
-glibmm_req = '>= 2.65.1'
+glibmm_req = '>= 2.67.1'
 
 # Gtk supported pkg-config files on MSVC files for a good while, so just use that
-gtk_req = '>= 3.99.0'
+gtk_req = '>= 3.99.4'
 gtk_dep = dependency('gtk4', version: gtk_req)
 
 cairomm_req = '>= 1.15.4'
 cairomm_dep = dependency('cairomm-1.16', version: cairomm_req)
 
-pangomm_req = '>= 2.43.3'
-pangomm_dep = dependency('pangomm-2.44', version: pangomm_req)
+pangomm_req = '>= 2.47.1'
+pangomm_dep = dependency('pangomm-2.48', version: pangomm_req)
 
 gdk_pixbuf_req = '>= 2.35.5'
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req)
@@ -119,7 +119,7 @@ epoxy_dep = dependency('epoxy', version: epoxy_req, required: build_demos)
 
 # The -mm libraries do not yet have pkg-config files for MSVC builds,
 # so check for them manually
-glibmm_req_minor_ver = '66'
+glibmm_req_minor_ver = '68'
 
 glibmm_dep = dependency('glibmm-2.@0@'.format(glibmm_req_minor_ver), version: glibmm_req)
 giomm_dep = dependency('giomm-2.@0@'.format(glibmm_req_minor_ver), version: glibmm_req)
@@ -134,7 +134,7 @@ gdkmm_requires = [
   'giomm-2.@0@'.format(glibmm_req_minor_ver), glibmm_req,
   'gtk4', gtk_req,
   'cairomm-1.16', cairomm_req,
-  'pangomm-2.44', cairomm_req,
+  'pangomm-2.48', pangomm_req,
   'gdk-pixbuf-2.0', gdk_pixbuf_req,
 ]
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 298ffc0b..fb89f05a 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.66
+extra_defs_gen_generate_defs_gdk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.68
 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.66
+extra_defs_gen_generate_defs_gtk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.68
 extra_defs_gen_generate_defs_gtk_LDFLAGS = -no-undefined -avoid-version
 
 AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS)
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build
index 97e56728..d8754d8e 100644
--- a/tools/extra_defs_gen/meson.build
+++ b/tools/extra_defs_gen/meson.build
@@ -5,7 +5,7 @@
 # Output: m4_files, install_m4dir
 
 glibmm_generate_extra_defs_dep = cpp_compiler.find_library(
-  'glibmm_generate_extra_defs@0@-2.66'.format(msvc14x_toolset_ver),
+  'glibmm_generate_extra_defs@0@-2.68'.format(msvc14x_toolset_ver),
 )
 
 executable('generate_defs_gdk', 'generate_defs_gdk.cc',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]