[gtkmm] Use glibmm-2.56 instead of glibmm-2.54.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Use glibmm-2.56 instead of glibmm-2.54.
- Date: Fri, 25 Aug 2017 14:14:30 +0000 (UTC)
commit 7ad1e656c50a3e860faf3a0dcda24188bc8c52c9
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Aug 25 14:10:25 2017 +0200
Use glibmm-2.56 instead of glibmm-2.54.
We changed the ABI name in glibmm.
configure.ac | 6 +++---
tools/Makefile.am | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c8ee570..8d44d0b 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.54 >= 2.53.1.1 pangomm-2.42 >= 2.41.3 cairomm-1.16 >= 1.15.4 gtk+-4.0 >=
3.91.0 gdk-pixbuf-2.0 >= 2.35.5'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.56 >= 2.53.1.1 pangomm-2.42 >= 2.41.3 cairomm-1.16 >= 1.15.4 gtk+-4.0 >=
3.91.0 gdk-pixbuf-2.0 >= 2.35.5'])
AS_IF([test "x$gtkmm_host_windows" = xyes],
[GTKMM_MODULES=$GDKMM_MODULES],
@@ -117,7 +117,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.54])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.56])
MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-2.42 atkmm-2.26])
MM_ARG_DISABLE_DEPRECATED_API([GDKMM GTKMM])
@@ -125,7 +125,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++-2.0.tag], [sigc++-2.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm-2.54.tag], [glibmm-2.54])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.56.tag], [glibmm-2.56])
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.26.tag], [atkmm-2.26])
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a740d90..bbeb1e2 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.54
+extra_defs_gen_generate_defs_gdk_LDADD = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.56
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.54
+extra_defs_gen_generate_defs_gtk_LDADD = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.56
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]