[pangomm] Use glibmm-2.66 instead of glibmm-2.64
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm] Use glibmm-2.66 instead of glibmm-2.64
- Date: Tue, 17 Mar 2020 16:02:57 +0000 (UTC)
commit 42cd13cabc088e0a838567be10bc7659a3cc898a
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Tue Mar 17 16:58:59 2020 +0100
Use glibmm-2.66 instead of glibmm-2.64
We have changed the ABI name in glibmm.
MSVC_NMake/config-msvc.mak | 2 +-
configure.ac | 6 +++---
docs/reference/meson.build | 2 +-
meson.build | 4 ++--
tools/Makefile.am | 2 +-
tools/extra_defs_gen/meson.build | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index ada25c5..5451f0a 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -13,7 +13,7 @@ GLIB_API_VERSION = 2.0
LIBSIGC_MAJOR_VERSION = 3
LIBSIGC_MINOR_VERSION = 0
GLIBMM_MAJOR_VERSION = 2
-GLIBMM_MINOR_VERSION = 64
+GLIBMM_MINOR_VERSION = 66
CAIROMM_MAJOR_VERSION = 1
CAIROMM_MINOR_VERSION = 16
diff --git a/configure.ac b/configure.ac
index 8bd807d..d9c2e54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,17 +49,17 @@ MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
AC_DISABLE_STATIC
LT_INIT([win32-dll])
-AC_SUBST([PANGOMM_MODULES], ['glibmm-2.64 >= 2.63.1 cairomm-1.16 >= 1.15.1 pangocairo >= 1.41.0'])
+AC_SUBST([PANGOMM_MODULES], ['glibmm-2.66 >= 2.65.1 cairomm-1.16 >= 1.15.1 pangocairo >= 1.41.0'])
PKG_CHECK_MODULES([PANGOMM], [$PANGOMM_MODULES])
MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
-MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.64])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.66])
MM_ARG_DISABLE_DEPRECATED_API
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.64.tag], [glibmm-2.64])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.66.tag], [glibmm-2.66])
MM_ARG_WITH_TAGFILE_DOC([cairomm-1.16.tag], [cairomm-1.16])
AC_LANG([C++])
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 4fbb9b9..49ce4fd 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -8,7 +8,7 @@
tag_file_modules = [
'mm-common-libstdc++',
'sigc++-3.0',
- 'glibmm-2.64',
+ 'glibmm-2.66',
'cairomm-1.16',
]
doxygen_tagfiles = ''
diff --git a/meson.build b/meson.build
index 76fd28a..ab1b82a 100644
--- a/meson.build
+++ b/meson.build
@@ -84,11 +84,11 @@ pangocairo_dep = dependency('pangocairo', version: pangocairo_req)
# glibmm recently gained Meson build support, so we can try looking
# for its pkg-config files on Visual Studio as well
-glibmm_req = '>= 2.63.1'
+glibmm_req = '>= 2.65.1'
# The -mm libraries do not yet have pkg-config files for MSVC builds,
# so check for them manually
-glibmm_req_minor_ver = '64'
+glibmm_req_minor_ver = '66'
cairomm_req_minor_ver = '16'
if is_msvc
diff --git a/tools/Makefile.am b/tools/Makefile.am
index daf0ccb..8fa56bb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,7 +29,7 @@ dist_gmmproc_m4_DATA = $(files_codegen_m4:%=m4/%)
noinst_PROGRAMS = extra_defs_gen/generate_extra_defs
extra_defs_gen_generate_extra_defs_SOURCES = extra_defs_gen/generate_defs_pango.cc
-extra_defs_gen_generate_extra_defs_LDADD = $(PANGOMM_LIBS) -lglibmm_generate_extra_defs-2.64
+extra_defs_gen_generate_extra_defs_LDADD = $(PANGOMM_LIBS) -lglibmm_generate_extra_defs-2.66
extra_defs_gen_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version
AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(PANGOMM_CFLAGS)
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build
index 03d2cd8..fcff20b 100644
--- a/tools/extra_defs_gen/meson.build
+++ b/tools/extra_defs_gen/meson.build
@@ -4,7 +4,7 @@
# Output: m4_files, install_m4dir
glibmm_generate_extra_defs_dep = cpp_compiler.find_library(
- 'glibmm_generate_extra_defs-2.64',
+ 'glibmm_generate_extra_defs-2.66',
)
executable('generate_extra_defs', 'generate_defs_pango.cc',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]