Attachment 86523 Details for Bug 69797 – bump GLib dep and use versioning macros

[patch] bump GLib dep and use versioning macros

0001-bump-GLib-dep-and-use-versioning-macros.patch (text/plain), 1.64 KB, created by Guillaume Desmottes on 2013-09-25 09:03:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-09-25 09:03:22 UTC

Size: 1.64 KB

patch

obsolete

>From 15f9b0e7259c46747326758d62c5a9ecb6ce3af2 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Tue, 24 Sep 2013 11:57:45 +0200
>Subject: [PATCH 01/15] bump GLib dep and use versioning macros
>
>Set to 2.32 as tp-glib so we can safely use newer API.
>
>Also, stop disabling single include warnings.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=69797
>---
> configure.ac | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index d710617..b65c3c3 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -66,7 +66,6 @@ AC_COPYRIGHT([
> ])
> 
> # Minimal version required
>-GLIB_REQUIRED=2.28
> DBUS_REQUIRED=1.1.0
> DBUS_GLIB_REQUIRED=0.82
> 
>@@ -74,13 +73,10 @@ TELEPATHY_GLIB_REQUIRED=0.19.2
> AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations])
> AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
> 
>-# Warning if GLib/GDK/GTK headers are included
>-AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
>-AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
>-
>-# Disable GLib deprecation warnings for now; GValueArray is deprecated but we
>-# need it for dbus-glib.
>-AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
>+GLIB_REQUIRED=2.32
>+dnl MIN_REQUIRED must stay to 2.30 because of GValueArray
>+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
>+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevent post 2.32 APIs])
> 
> AC_CONFIG_MACRO_DIR([m4])
> AC_CONFIG_HEADERS([config.h])
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69797: 86523 | 86524 | 86525 | 86526 | 86528 | 86529 | 86530 | 86531 | 86532 | 86533 | 86534 | 86535 | 86536 | 86537 | 86538

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.