[gtkmm/use-dllexport: 15/60] Use glibmm-2.66 instead of glibmm-2.64
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/use-dllexport: 15/60] Use glibmm-2.66 instead of glibmm-2.64
- Date: Mon, 8 Jun 2020 02:43:15 +0000 (UTC)
commit 3c5188bf560bbc293f1c1ecef8eda18ad50a537d
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Tue Mar 17 17:12:36 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 +++---
tools/Makefile.am | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 3b64d32e..30abbf85 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -46,7 +46,7 @@ LIBSIGC_MINOR_VERSION = 0
CAIROMM_MAJOR_VERSION = 1
CAIROMM_MINOR_VERSION = 16
GLIBMM_MAJOR_VERSION = 2
-GLIBMM_MINOR_VERSION = 64
+GLIBMM_MINOR_VERSION = 66
ATKMM_MAJOR_VERSION = 2
ATKMM_MINOR_VERSION = 30
PANGOMM_MAJOR_VERSION = 2
diff --git a/configure.ac b/configure.ac
index 63351aaa..a8c69885 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.64 >= 2.63.1 pangomm-2.44 >= 2.43.1 cairomm-1.16 >= 1.15.4 gtk4 >=
3.98.0 gdk-pixbuf-2.0 >= 2.35.5'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.66 >= 2.65.1 pangomm-2.44 >= 2.43.1 cairomm-1.16 >= 1.15.4 gtk4 >=
3.98.0 gdk-pixbuf-2.0 >= 2.35.5'])
AS_IF([test "x$gtkmm_host_windows" = xyes],
[GTKMM_MODULES=$GDKMM_MODULES],
@@ -120,7 +120,7 @@ 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.64])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.66])
MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-2.44 atkmm-2.30])
MM_ARG_DISABLE_DEPRECATED_API([GDKMM GTKMM])
@@ -128,7 +128,7 @@ 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.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])
MM_ARG_WITH_TAGFILE_DOC([pangomm-2.44.tag], [pangomm-2.44])
MM_ARG_WITH_TAGFILE_DOC([atkmm-2.30.tag], [atkmm-2.30])
diff --git a/tools/Makefile.am b/tools/Makefile.am
index df06883c..298ffc0b 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.64
+extra_defs_gen_generate_defs_gdk_LDADD = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.66
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.64
+extra_defs_gen_generate_defs_gtk_LDADD = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.66
extra_defs_gen_generate_defs_gtk_LDFLAGS = -no-undefined -avoid-version
AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]