[pangomm] Use the glibmm-2.52 ABI instead of glibmm-2.4
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm] Use the glibmm-2.52 ABI instead of glibmm-2.4
- Date: Mon, 14 Nov 2016 09:44:38 +0000 (UTC)
commit 8ee1599bcb49e4abfd84a7997e344a32fe18d8c3
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Nov 11 10:52:24 2016 +0100
Use the glibmm-2.52 ABI instead of glibmm-2.4
configure.ac | 8 ++++----
pango/src/fontset.hg | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 225a578..4146f6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,17 +49,17 @@ MM_AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
AC_DISABLE_STATIC
LT_INIT([win32-dll])
-AC_SUBST([PANGOMM_MODULES], ['glibmm-2.4 >= 2.48.0 cairomm-1.0 >= 1.2.2 pangocairo >= 1.38.0'])
+AC_SUBST([PANGOMM_MODULES], ['glibmm-2.52 >= 2.48.0 cairomm-1.0 >= 1.2.2 pangocairo >= 1.38.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.4])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.52])
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++-2.0.tag], [sigc++-2.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
+MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.52.tag], [glibmm-2.52])
MM_ARG_WITH_TAGFILE_DOC([cairomm-1.0.tag], [cairomm-1.0])
AC_LANG([C++])
diff --git a/pango/src/fontset.hg b/pango/src/fontset.hg
index aa0d9b9..73e5a39 100644
--- a/pango/src/fontset.hg
+++ b/pango/src/fontset.hg
@@ -44,7 +44,7 @@ public:
/** For instance,
* bool on_foreach(const Glib::RefPtr<Pango::Font>& font);
*/
- typedef sigc::slot< bool, const Glib::RefPtr<Font>& > ForeachSlot;
+ typedef sigc::slot<bool(const Glib::RefPtr<Font>&)> ForeachSlot;
/** Iterates through all the fonts in a fontset, calling @a slot for
* each one. If @a slot returns true, that stops the iteration.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]