telepathy-gabble: Officially depend on GLib 2.32

Simon McVittie smcv at kemper.freedesktop.org
Tue Jun 11 03:32:08 PDT 2013


Module: telepathy-gabble
Branch: master
Commit: 2a8a6a50be5241627108a23f1dd1ba8d12693f8b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=2a8a6a50be5241627108a23f1dd1ba8d12693f8b

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May 30 14:02:19 2013 +0100

Officially depend on GLib 2.32

In practice we depend on it anyway, via telepathy-glib 0.19.9.
Also update the telepathy-glib dependency in the .pc files to match
configure.ac.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65290
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---

 configure.ac                              |    6 +++---
 gabble/telepathy-gabble-uninstalled.pc.in |    2 +-
 gabble/telepathy-gabble.pc.in             |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 645524a..bbf2771 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,11 +224,11 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], [test "x$enable_gtk_doc" = xyes])
 
 dnl Check for Glib
 PKG_CHECK_MODULES(GLIB,
-    [glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gthread-2.0 >= 2.30, gio-2.0])
-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.30])
+    [glib-2.0 >= 2.32, gobject-2.0, gthread-2.0, gio-2.0])
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.32])
 
 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_32, [Prevent post 2.32 APIs])
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
diff --git a/gabble/telepathy-gabble-uninstalled.pc.in b/gabble/telepathy-gabble-uninstalled.pc.in
index 4e1196f..f5d027f 100644
--- a/gabble/telepathy-gabble-uninstalled.pc.in
+++ b/gabble/telepathy-gabble-uninstalled.pc.in
@@ -12,6 +12,6 @@ Name: Telepathy-Gabble
 Description: XMPP backend for the Telepathy framework
 Version: @VERSION@
 Requires: pkg-config >= 0.21
-Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gio-2.0, telepathy-glib >= 0.7.37
+Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib >= 0.19.9
 Libs: ${abs_top_builddir}/src/libgabble-plugins.la
 Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky
diff --git a/gabble/telepathy-gabble.pc.in b/gabble/telepathy-gabble.pc.in
index 5e0a46b..013ddbb 100644
--- a/gabble/telepathy-gabble.pc.in
+++ b/gabble/telepathy-gabble.pc.in
@@ -11,6 +11,6 @@ Name: Telepathy-Gabble
 Description: XMPP backend for the Telepathy framework
 Version: @VERSION@
 Requires: pkg-config >= 0.21
-Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gio-2.0, telepathy-glib >= 0.7.37
+Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib >= 0.19.9
 Libs: -L${pluginexeclibdir} -lgabble-plugins -lwocky
 Cflags: -I${includedir}/telepathy-gabble-0



More information about the telepathy-commits mailing list