Attachment 65177 Details for Bug 53162 – The corresponding patch for telepathy-yts

[patch] The corresponding patch for telepathy-yts

0002-Depend-on-GLib-2.30-tp-glib-0.18-and-ignore-any-newe.patch (text/plain), 1.60 KB, created by Simon McVittie on 2012-08-06 12:53:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-08-06 12:53:33 UTC

Size: 1.60 KB

patch

obsolete

>From 2bad2e2ba787d00737a1fd6e6235e354ebeb293f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 2 Aug 2012 12:10:26 +0100
>Subject: [PATCH 2/2] Depend on GLib 2.30, tp-glib 0.18 and ignore any newer
> deprecations
>
>---
> configure.ac |   18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 7f0bb8b..e19408d 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -168,15 +168,18 @@ fi
> 
> if test x$enable_glib = xyes; then
>    dnl Check for Glib
>-   PKG_CHECK_MODULES(GLIB, [
>-	glib-2.0 >= 2.16,
>-	gobject-2.0 >= 2.16,
>-	gthread-2.0 >= 2.16,
>-	gio-2.0 >= 2.16])
>+   PKG_CHECK_MODULES([GLIB], [
>+	glib-2.0 >= 2.30,
>+	gobject-2.0 >= 2.30,
>+	gthread-2.0 >= 2.30,
>+	gio-2.0 >= 2.30])
> 
>   AC_SUBST(GLIB_CFLAGS)
>   AC_SUBST(GLIB_LIBS)
> 
>+  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])
>+
>   GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
>   AC_SUBST(GLIB_GENMARSHAL)
> 
>@@ -187,10 +190,13 @@ if test x$enable_glib = xyes; then
>   AC_SUBST(DBUS_LIBS)
> 
>   dnl Check for telepathy-glib
>-  PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.17.1])
>+  PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.18])
> 
>   AC_SUBST(TP_GLIB_CFLAGS)
>   AC_SUBST(TP_GLIB_LIBS)
>+
>+  AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_0_18], [Ignore post 0.18 deprecations])
>+  AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_0_18], [Prevent post 0.18 APIs])
> fi
> 
> dnl Check for code generation tools
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 53162: 65176 | 65177

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.