[Pkg-telepathy-commits] [empathy] 07/12: Add a patch to avoid linking to telepathy-logger's private API

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch telepathy1
in repository empathy.

commit d8debcf59370963474a3d02e6d2ea44594554722
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Apr 3 20:07:15 2014 +0100

    Add a patch to avoid linking to telepathy-logger's private API
---
 debian/changelog                                   |  1 +
 ...entally-linking-to-telepathy-logger-s-pri.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7d8b293..beb1397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ empathy (3.12.0+66+g529cd04-0tp1.1) telepathy1; urgency=low
   * Bump debian/compat to 9
   * Explicitly set the multiarch ${libdir}, required for MC 6 plugins
     (it seems cdbs doesn't do that even under dh compat 9)
+  * Add a patch to avoid linking to telepathy-logger's private API
 
  -- Simon McVittie <smcv at debian.org>  Thu, 03 Apr 2014 19:40:22 +0100
 
diff --git a/debian/patches/0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch b/debian/patches/0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch
new file mode 100644
index 0000000..027877e
--- /dev/null
+++ b/debian/patches/0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch
@@ -0,0 +1,37 @@
+From 1b4ec57cc8544f6db3d7776f10716ad342969da6 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Thu, 3 Apr 2014 20:06:26 +0100
+Subject: [PATCH] Avoid accidentally linking to telepathy-logger's private API
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=727162
+---
+ libempathy/action-chain-internal.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/libempathy/action-chain-internal.h b/libempathy/action-chain-internal.h
+index 14750c9..1b8756f 100644
+--- a/libempathy/action-chain-internal.h
++++ b/libempathy/action-chain-internal.h
+@@ -24,6 +24,19 @@
+ #include <glib-object.h>
+ #include <gio/gio.h>
+ 
++/* Avoid accidentally using the symbols exported by the telepathy-logger
++ * library (GNOME#727162) */
++#define _tpl_action_chain_new_async   _empathy_action_chain_new_async
++#define _tpl_action_chain_free        _empathy_action_chain_free
++#define _tpl_action_chain_append      _empathy_action_chain_append
++#define _tpl_action_chain_prepend     _empathy_action_chain_prepend
++#define _tpl_action_chain_start       _empathy_action_chain_start
++#define _tpl_action_chain_continue    _empathy_action_chain_continue
++#define _tpl_action_chain_terminate   _empathy_action_chain_terminate
++#define _tpl_action_chain_clear       _empathy_action_chain_clear
++#define _tpl_action_chain_get_object  _empathy_action_chain_get_object
++#define _tpl_action_chain_new_finish  _empathy_action_chain_new_finish
++
+ typedef struct {
+     GQueue *chain;
+     GSimpleAsyncResult *simple;
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..91c27c9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git