Attachment 80201 Details for Bug 65290 – Officially depend on GLib 2.32

[patch] Officially depend on GLib 2.32

0002-Officially-depend-on-GLib-2.32.patch (text/plain), 2.58 KB, created by Simon McVittie on 2013-06-03 10:39:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-06-03 10:39:31 UTC

Size: 2.58 KB

patch

obsolete

>From dbda767521d94e75e7a0f858ba64b1fc72f9848c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 30 May 2013 14:02:19 +0100
>Subject: [PATCH 2/5] 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.
>---
> 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 d4c78bf..f7911b1 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
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 65290: 80200 | 80201 | 80209 | 80211 | 80212 | 80221 | 80227 | 80232 | 80283 | 80284 | 80285 | 80689

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.