From 6e774929fa5d36d3dd975d1c16f4fb8a889f6cc2 Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Tue, 21 Jun 2011 20:55:07 +0000 Subject: [PATCH] Fix build with with libpurple.8 PR: 158070 Submitted by: Mark Atkinson Approved by: John Prather (maintainer) --- .../patch-src__purple__purple-dnsquery.c | 13 ++++++++ .../files/patch-src__purple__purple-plugin.c | 13 ++++++++ .../files/patch-src__purple__purple-private.h | 31 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c create mode 100644 net-im/pidgin-sipe/files/patch-src__purple__purple-plugin.c create mode 100644 net-im/pidgin-sipe/files/patch-src__purple__purple-private.h diff --git a/net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c b/net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c new file mode 100644 index 000000000000..301fdce22ef9 --- /dev/null +++ b/net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c @@ -0,0 +1,13 @@ +--- ./src/purple/purple-dnsquery.c.orig 2010-11-03 05:13:51.000000000 +0100 ++++ ./src/purple/purple-dnsquery.c 2011-06-21 11:23:35.000000000 +0200 +@@ -22,6 +22,10 @@ + + #include "glib.h" + ++#include "version.h" ++#if PURPLE_VERSION_CHECK(2,8,0) ++#include "account.h" ++#endif + #include "dnssrv.h" + + #include "sipe-backend.h" diff --git a/net-im/pidgin-sipe/files/patch-src__purple__purple-plugin.c b/net-im/pidgin-sipe/files/patch-src__purple__purple-plugin.c new file mode 100644 index 000000000000..88d296c11393 --- /dev/null +++ b/net-im/pidgin-sipe/files/patch-src__purple__purple-plugin.c @@ -0,0 +1,13 @@ +--- ./src/purple/purple-plugin.c.orig 2010-11-03 05:13:51.000000000 +0100 ++++ ./src/purple/purple-plugin.c 2011-06-21 11:23:35.000000000 +0200 +@@ -506,6 +506,10 @@ + NULL, /* get_moods */ + NULL, /* set_public_alias */ + NULL, /* get_public_alias */ ++#if PURPLE_VERSION_CHECK(2,8,0) ++ NULL, /* add_buddy_with_invite */ ++ NULL, /* add_buddies_with_invite */ ++#endif + #endif + #endif + #endif diff --git a/net-im/pidgin-sipe/files/patch-src__purple__purple-private.h b/net-im/pidgin-sipe/files/patch-src__purple__purple-private.h new file mode 100644 index 000000000000..eefc01a5f9cb --- /dev/null +++ b/net-im/pidgin-sipe/files/patch-src__purple__purple-private.h @@ -0,0 +1,31 @@ +--- ./src/purple/purple-private.h.orig 2010-11-03 05:13:51.000000000 +0100 ++++ ./src/purple/purple-private.h 2011-06-21 11:23:35.000000000 +0200 +@@ -20,18 +20,28 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include "version.h" ++ + /* Forward declarations */ + struct sipe_core_public; + struct _PurpleAccount; + struct _PurpleConnection; ++#if PURPLE_VERSION_CHECK(2,8,0) ++struct _PurpleSrvTxtQueryData; ++#else + struct _PurpleSrvQueryData; ++#endif + struct _PurpleXfer; + + struct sipe_backend_private { + struct sipe_core_public *public; + struct _PurpleConnection *gc; + struct _PurpleAccount *account; ++#if PURPLE_VERSION_CHECK(2,8,0) ++ struct _PurpleSrvTxtQueryData *dns_query; ++#else + struct _PurpleSrvQueryData *dns_query; ++#endif + time_t last_keepalive; + }; +